Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
94d18f9
Trying to add new pages
erolaliyev Jan 13, 2021
d2d5af0
Trying to add new pages
erolaliyev Jan 13, 2021
f17402f
Current state
erolaliyev Jan 13, 2021
bc23c7e
Adding assets for new pages
erolaliyev Jan 13, 2021
7c2c55b
We punt on the home page just yet, and make Consulting the home page.
granicz Jan 13, 2021
3033964
Template for new Trainings page
erolaliyev Jan 19, 2021
a7baf47
Removed .vs folder files
erolaliyev Jan 19, 2021
2ac9949
Added new application page for single job opening #10
erolaliyev Jan 20, 2021
26a67e1
#17 - Minifying css, converting custom.css to scss, setting up grunt …
Jooseppi12 Jan 21, 2021
7497713
Added content for careers page #10
erolaliyev Jan 21, 2021
4454ab7
Extend tooling, create vscode workspace with some predefined settings…
Jooseppi12 Jan 22, 2021
2eaf6f2
#17 - Use minified css in html templates, make sure the font-awesome …
Jooseppi12 Jan 22, 2021
ee077ae
#17 - Use hexadecimal color codes consistently in custom.scss
Jooseppi12 Jan 22, 2021
48c7fbe
Added content for Trainings page #19
erolaliyev Jan 22, 2021
baef3ab
Added content for Careers and Open Position pages #10
erolaliyev Jan 22, 2021
6646de4
#7 Update scripts for more granular handling of processes, remove npm…
Jooseppi12 Jan 22, 2021
752f557
Remove generated custom.css file, Fix infinite loop in grunt-watch, R…
Jooseppi12 Jan 22, 2021
99fb7ea
RSS/Atom feed links and styling on user blog pages.
granicz Jan 23, 2021
43b4729
#10 Changed content for Open Position page
erolaliyev Jan 25, 2021
a8bfd8f
#19 Changed images for Trainings page
erolaliyev Jan 25, 2021
08bd285
#10 Changed content for Jobs and Open Position pages
erolaliyev Jan 25, 2021
68d202d
Change icons to Font Awesome in Careers, Open Position and Trainings …
erolaliyev Jan 25, 2021
13f252f
Trying to replace images
erolaliyev Jan 25, 2021
a4968c8
There are dark and light menubars - depending on the banners/images t…
granicz Jan 26, 2021
fefbaed
#10 Optimized images for Open Position page
erolaliyev Jan 26, 2021
3e70605
#10 Optimized images for Jobs page and added FAQ section
erolaliyev Jan 26, 2021
eaefd9c
#19 Optimization for images on Trainings page
erolaliyev Jan 27, 2021
5b8d834
#19 Image optimization for Trainings page
erolaliyev Jan 27, 2021
e84a9d0
#9 Optimizing images for Consulting page
erolaliyev Jan 27, 2021
e5d6fdf
Change open source menu style
Jooseppi12 Jan 28, 2021
bb98b25
#10 Fixed typo on Open Position page
erolaliyev Jan 28, 2021
eb33925
#9 Optimizing images for Consulting page
erolaliyev Jan 28, 2021
9d8fcf2
Remove Bulma Drawer, Change header styling
Jooseppi12 Jan 28, 2021
678615d
Change header stylings here and there
Jooseppi12 Jan 28, 2021
997d67f
#8 - Research page content WIP
Jooseppi12 Jan 29, 2021
871acb2
Make Careers header non-sticky, Add hover information for Contact pag…
Jooseppi12 Jan 29, 2021
f12328c
Fixes after rebase
Jooseppi12 Jan 29, 2021
b7eeda3
Add extra sections
Jooseppi12 Feb 1, 2021
12e295d
Update install.ps1
Jooseppi12 Feb 1, 2021
f1e04e5
Fix header issue (caused by footer), fix cp command
Jooseppi12 Feb 2, 2021
d5f2ecd
Added article keys to the debug screen.
granicz Feb 2, 2021
50831fd
Add date and author section to individual blog posts
erolaliyev Feb 2, 2021
ca21aea
#10 Created new page for intern position and added extra section to C…
erolaliyev Feb 2, 2021
d551936
Remove node-sass from dependencies, as it is not required
Jooseppi12 Feb 3, 2021
25b7329
Fix vscode tasks, update node-sass to the latest package
Jooseppi12 Feb 3, 2021
faa9e28
Update outdated package, remove unused file from repository
Jooseppi12 Feb 3, 2021
35f0318
#19 add training links
mrtank Feb 4, 2021
05afb39
#19 - Courses are scraped from trainings folder
mrtank Feb 4, 2021
3298256
#19 Change relative to absolute links
Jooseppi12 Feb 4, 2021
17a8ff7
Implemented jobs folder structure for new open positions in the future
erolaliyev Feb 4, 2021
8a17e28
#19 - Tutorialing instead of courses.
mrtank Feb 5, 2021
723a909
#19 - Add Call to Action email actions. Fix folder scraping issues.
mrtank Feb 5, 2021
3370c75
#6 - Update build scripts to use normal verbosity
Jooseppi12 Feb 5, 2021
d16034a
Added a master sidebar to the job pages that describes the applicatio…
granicz Feb 5, 2021
6d383c5
#9 #19 hover zoom. Content for consulting. Fix url encode for subject.
mrtank Feb 5, 2021
16af0ac
#10 Added FAQ for individual open job position pages
erolaliyev Feb 5, 2021
df7cb74
#19 #9 - Links to the main IntelliFactory tools. li links into snippets.
mrtank Feb 8, 2021
41aba5a
Add Dockerfile
Jooseppi12 Feb 8, 2021
07b0ab1
Add helper scripts for Docker
Jooseppi12 Feb 8, 2021
207428a
Moved the blog page template from index.html to blogpost.html - might…
granicz Feb 8, 2021
83a11a5
#9 - full path for assets. Try to use progress.js. Use themekit zoom …
mrtank Feb 8, 2021
8562a56
#9 Fixed the number counter
erolaliyev Feb 8, 2021
b4fc5cb
Fix #26 - Add common metatags to blog pages
granicz Feb 9, 2021
e62a6cc
#9 h2 fix. Faster counter.
mrtank Feb 9, 2021
228bb3a
#19 add hints for typo in url.
mrtank Feb 9, 2021
4fa146b
#27 - Add metatags
Jooseppi12 Feb 9, 2021
21a0a33
#28 - Categoires page
Jooseppi12 Feb 10, 2021
72d9814
Added time to read section
Jooseppi12 Feb 10, 2021
2c1becb
Fixed date format and tweaked style on the blog pages.
granicz Feb 9, 2021
d485bd5
Fix issue with blog tags visual
Jooseppi12 Feb 10, 2021
6e192b0
Updated to WS 4.7.x and FCore 5, and markdig/yamldotnet to their latest.
granicz Aug 25, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
with:
dotnet-version: '3.1.x'
- run: |
bash ./install.sh -buildonly
bash ./build.sh

- name: Deploy 🚀
Expand Down
20 changes: 11 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/.tools
/.vs
/build
/src/Client/bin
/src/Client/obj
/src/Website/.vs
/src/Website/bin
/src/Website/obj
/src/Hosted/css
/src/Hosted/assets/custom.css
/src/Hosted/bin
/src/Hosted/obj
/src/Hosted/js
/src/Hosted/css
/src/Hosted/scripts
/src/Hosted/node_modules
/src/Hosted/js
/src/Hosted/legal
/src/Hosted/node_modules
/src/Hosted/obj
/src/Hosted/posts
/build
/src/Hosted/scripts
*.user
/.ionide
*.bak*
*.done
*.min.css
*.map
*.vs/

*.ionide*
136 changes: 136 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "Build Solution in Release mode",
"type": "shell",
"command": "./build.sh",
"windows": {
"command": ".\\build.ps1"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Build Solution in Debug mode",
"type": "shell",
"command": "./build.sh -deb",
"windows": {
"command": ".\\build.ps1 -deb"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Build Project in Debug mode",
"type": "shell",
"command": "./build.sh -deb -project ${input:project}",
"windows": {
"command": ".\\build.ps1 -deb -project ${input:project}"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Build Project in Release mode",
"type": "shell",
"command": "./build.sh -project ${input:project}",
"windows": {
"command": ".\\build.ps1 -project ${input:project}"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Install with tools",
"type": "shell",
"command": "./install.sh",
"windows": {
"command": ".\\install.ps1"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Install",
"type": "shell",
"command": "./install.sh -buildonly",
"windows": {
"command": ".\\install.ps1 -buildOnly"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Run Hosted",
"type": "shell",
"command": "./run.sh",
"windows": {
"command": ".\\run.ps1"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Serve as an offline sitelet",
"type": "shell",
"command": "./serve.sh",
"windows": {
"command": ".\\serve.ps1"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "CSS Server",
"type": "shell",
"command": "./grunt-watch.sh",
"windows": {
"command": ".\\grunt-watch.ps1"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
}
],
"inputs": [
{
"type": "pickString",
"id": "project",
"description": "Which project you want to build?",
"options": [
"client",
"hosted",
"website"
]
}
]
}
25 changes: 25 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
FROM mcr.microsoft.com/dotnet/sdk:3.1

# Update environment
RUN apt-get update

# Install npm
RUN apt-get -y install curl gnupg
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN apt-get -y install nodejs
RUN echo "NODE Version:" && node --version
RUN echo "NPM Version:" && npm --version

# Create working directory
RUN mkdir /website

# Copy content under /website from the root of the repo
COPY . /website

WORKDIR /website

# Exposing port used by the serve.sh
EXPOSE 56001

# Install, build and serve
CMD bash -c "./install.sh && ./build.sh && ls -a && ./serve.sh"
40 changes: 26 additions & 14 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
echo "Copy legal files"

xcopy .\legal\site-docs\intellifactory.com\* .\src\Hosted\legal\ /s /e

echo "Copy blog posts files"

xcopy .\blogs\user\* .\src\Hosted\posts\ /s /e

echo "Running npm install"

pushd src/Hosted
npm install
popd
Param(
[Switch]
$deb,
[Parameter(Mandatory=$false)]
[ValidateSet("client", "hosted", "website")]
[String]
$project
)

echo "Running dotnet build"

dotnet build SiteFi.sln
if ($project -ne "") {
if ($deb) {
echo "Running build in Debug mode..."
dotnet build "src\$project\$project.fsproj" --no-incremental -c Debug -v normal
} else {
echo "Running build in Release mode..."
dotnet build "src\$project\$project.fsproj" --no-incremental -v normal
}
} else {
if ($deb) {
echo "Running build in Debug mode..."
dotnet build SiteFi.sln --no-incremental -c Debug -v normal
} else {
echo "Running build in Release mode..."
dotnet build SiteFi.sln --no-incremental -v normal
}
}

53 changes: 34 additions & 19 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,24 +1,39 @@
#!/bin/bash

echo "Copy legal/site-docs/if.com/ under src/Hosted/legal/"

cp -r legal/site-docs/intellifactory.com/ src/Hosted/legal/

echo "Copy blogposts under /src/Hosted/posts"

cp -r blogs/user src/Hosted/posts

echo "Installing dotnet-serve"

dotnet tool install dotnet-serve --tool-path .tools

echo "Running npm install"

pushd src/Hosted
npm install
popd

echo "Running dotnet build"

dotnet build SiteFi.sln
if [[ $(echo "$2" | awk '{print toupper($0)}') = "-PROJECT" ]];
then
if [[ $(echo "$3" | awk '{print toupper($0)}') = "CLIENT" ]] || [[ $(echo "$3" | awk '{print toupper($0)}') = "WEBSITE" ]] || [[ $(echo "$3" | awk '{print toupper($0)}') = "HOSTED" ]];
then
if [[ $(echo "$1" | awk '{print toupper($0)}') = "-DEB" ]];
then
dotnet build "src/$3/$3.fsproj" --no-incremental -c Debug -v normal
else
dotnet build "src/$3/$3.fsproj" --no-incremental -v normal
fi
else
>&2 echo "Incorrect project name"
exit 1
fi
else
if [[ $(echo "$1" | awk '{print toupper($0)}') = "-PROJECT" ]];
then
if [[ $(echo "$2" | awk '{print toupper($0)}') = "CLIENT" ]] || [[ $(echo "$2" | awk '{print toupper($0)}') = "WEBSITE" ]] || [[ $(echo "$2" | awk '{print toupper($0)}') = "HOSTED" ]];
then
dotnet build "src/$2/$2.fsproj" --no-incremental -v normal
else
>&2 echo "Incorrect project name"
exit 1
fi
else
if [[ $(echo "$1" | awk '{print toupper($0)}') = "-DEB" ]];
then
dotnet build SiteFi.sln --no-incremental -c Debug -v normal
else
dotnet build SiteFi.sln --no-incremental -v normal
fi
fi
fi


6 changes: 6 additions & 0 deletions docker.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pushd src\Hosted
rm -rf node_modules
popd

docker build -t website .
docker run -p 56001:56001 website
9 changes: 9 additions & 0 deletions docker.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

# Make sure the windows dependencies are not there
pushd src/Hosted
rm -rf node_modules
popd

docker build -t website .
docker run -p 56001:56001 website
2 changes: 2 additions & 0 deletions grunt-watch.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
cd src/Hosted
npx grunt develop
2 changes: 2 additions & 0 deletions grunt-watch.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
cd src/Hosted
npx grunt develop
12 changes: 12 additions & 0 deletions install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,21 @@ param(
[switch] $buildOnly
)

echo "Copy legal files"

xcopy .\legal\site-docs\intellifactory.com\* .\src\Hosted\legal\ /s /e

echo "Copy blog posts files"

xcopy .\blogs\user\* .\src\Hosted\posts\ /s /e

# Initialize git submodules
git submodule update --init --recursive

# Install npm packages
pushd src\Hosted
npm install
npx grunt
popd

if (!$buildOnly) {
Expand Down
22 changes: 22 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash

# Initialize git submodules
git submodule update --init --recursive

echo "Copy legal/site-docs/if.com/ under src/Hosted/legal/"
cp -rT legal/site-docs/intellifactory.com/ src/Hosted/legal/

echo "Copy blogposts under /src/Hosted/posts"
cp -rT blogs/user src/Hosted/posts

# Install npm packages
pushd src/Hosted
npm install
npx grunt
popd

if ! [[ $(echo "$1" | awk '{print toupper($0)}') = "-BUILDONLY" ]];
then
# Install local dotnet-serve
dotnet tool install dotnet-serve --tool-path .tools
fi
1 change: 1 addition & 0 deletions run.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dotnet run --project src\Hosted\Hosted.fsproj
1 change: 1 addition & 0 deletions run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dotnet run --project src/Hosted/Hosted.fsproj
1 change: 1 addition & 0 deletions serve.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.tools/dotnet-serve.exe -d build -p:56001 --default-extensions:.html -a 0.0.0.0
1 change: 1 addition & 0 deletions serve.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
".tools/dotnet-serve" -d build -p:56001 --default-extensions:.html -a 0.0.0.0
Loading