Skip to content

Commit

Permalink
Merge pull request #64 from JustalK/pre-dev
Browse files Browse the repository at this point in the history 
Fixing the website prod
  • Loading branch information
@JustalK
JustalK committed Mar 28, 2021
2 parents d32ca78 + dfba91b commit 42438ff
Show file tree
Hide file tree
Showing 12 changed files with 201 additions and 107 deletions.
3 changes: 2 additions & 1 deletion config/base.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ const path = require('path');
const webpack = require('webpack');
const mode = process.env.NODE_ENV !== undefined ? process.env.NODE_ENV : 'production';
require('dotenv').config({ path: './env/.env.' + mode });
const base_url = process.env.PROTOCOL + '://' + process.env.HOST + ':' + process.env.PORT;
const port = process.env.PORT ? ':' + process.env.PORT : '';
const base_url = process.env.PROTOCOL + '://' + process.env.HOST + port;


module.exports = {
Expand Down
3 changes: 2 additions & 1 deletion config/dev.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ module.exports = merge(baseConfig, {
loader: 'file-loader',
options: {
name: '[name].[ext]',
outputPath: 'assets/imgs/'
outputPath: 'assets/imgs/',
esModule: false
}
} ]
} ]
Expand Down
11 changes: 3 additions & 8 deletions config/prod.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,11 @@ module.exports = merge(baseConfig, {
{
test: /\.(png|jpg|jpeg|gif)$/,
use: [ {
loader: 'lqip-loader',
options: {
base64: true,
palette: false
}
}, {
loader: 'file-loader',
options: {
name: '[name].[ext]',
outputPath: 'assets/imgs/'
outputPath: 'assets/imgs/',
esModule: false
}
}, {
loader: 'image-webpack-loader',
Expand All @@ -42,7 +37,7 @@ module.exports = merge(baseConfig, {
enabled: false,
},
pngquant: {
quality: '20',
quality: [0.65, 0.95],
speed: 4
}
}
Expand Down
3 changes: 1 addition & 2 deletions env/.env.production
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ NODE_ENV=production
FOLDER=build

API_NAME=JUSTALK-SERVER
HOST=justalk.online
PORT=80
HOST=www.justalk.online
BACKEND_HOST=localhost
BACKEND_PORT=8080
PROTOCOL=https
Expand Down
Binary file added src/assets/imgs/github.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/imgs/google.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
150 changes: 84 additions & 66 deletions src/assets/less/introduction.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@
font-family: 'Lato-Light', sans-serif;
.transition(all 2s ease 2s);

& img {
width: 165px;
height: 165px;
margin-bottom: 30px;
}

& span {
display: block;

Expand All @@ -41,15 +35,6 @@
}
}

& .name {
text-transform: uppercase;
letter-spacing: 2rem;
word-spacing: 2rem;
margin-left: 2rem;
text-shadow: 0 0 8px #bddcff;
.font-size(20);
}

& .jobs {
text-transform: uppercase;
word-spacing: 0.6rem;
Expand All @@ -58,8 +43,8 @@

& .big {
position: absolute;
bottom: -180px;
width: 20%;
bottom: -120px;
width: 250px;
text-transform: uppercase;
line-height: 80px;
color: #009bfa;
Expand Down Expand Up @@ -87,7 +72,7 @@
}

& i {
width: 25%;
width: 20%;
height: 1px;
background: #61c3ff;
position: absolute;
Expand Down Expand Up @@ -115,17 +100,15 @@
}

& .portfolio {
margin-right: 5%;
right: calc(50% + 80px);
right: calc(50% + 50px);

& i {
left: 0;
}
}

& .resume {
margin-left: 5%;
left: calc(50% + 80px);
left: calc(50% + 50px);

&::after,
&::before {
Expand Down Expand Up @@ -161,11 +144,11 @@
}

&::after {
width: 250%;
width: 300px;
}

&::before {
width: 150%;
width: 120px;
}
}
}
Expand All @@ -174,32 +157,22 @@
width: 80px;
height: 80px;
position: absolute;
bottom: -180px;
bottom: -120px;
left: 50%;
transform: translateX(-50%) rotateZ(45deg) scale(2);
transform: translateX(-50%) rotateZ(45deg);

& a,
& div {
width: 38px;
height: 38px;
display: flex;
justify-content: center;
align-items: center;
background: @background-bloc-0;
position: absolute;

& span {
position: absolute;
writing-mode: vertical-rl;
text-orientation: upright;
text-transform: uppercase;
min-height: 80px;

&::after {
content: ' ';
width: 1px;
height: 100%;
background: #61c3ff;
position: absolute;
top: 0;
}
& img {
transform: rotateZ(-45deg);
}

&:nth-child(1) {
Expand Down Expand Up @@ -262,19 +235,9 @@
}
}
}
}

.mounted {
.intro {
opacity: 1;
}
}

#HOME {
&.invisible {
& .introduction {
opacity: 0;
}
.mobile {
display: none;
}
}

Expand Down Expand Up @@ -316,10 +279,6 @@
& .big {
.font-size(2);
}

& .links {
transform: translateX(-50%) rotateZ(45deg) scale(1.5);
}
}
}
}
Expand All @@ -338,11 +297,6 @@
& .big {
bottom: -120px;
}

& .links {
transform: translateX(-50%) rotateZ(45deg) scale(1);
bottom: -120px;
}
}
}
}
Expand Down Expand Up @@ -397,10 +351,6 @@
}
}

& .links {
transform: translateX(-50%) rotateZ(45deg) scale(0.8);
}

& .portfolio {
margin-right: 8%;
right: calc(50% + 55px);
Expand All @@ -413,3 +363,71 @@
}
}
}

@media screen and (max-width: @MOBILE) {
.introduction {
.intro {
display: none;
}

canvas {
display: none;
}

.mobile {
position: absolute;
display: block;
width: 100%;
text-align: center;
bottom: 50%;
transform: translateY(50%);
user-select: none;
color: @text-color;
opacity: 0;
font-family: 'Lato-Light', sans-serif;
.transition(all 2s ease 2s);

& .name {
text-transform: uppercase;
letter-spacing: 2rem;
word-spacing: 2rem;
margin-left: 2rem;
margin-bottom: 5rem;
text-shadow: 0 0 8px #bddcff;
.font-size(4);
}

& ul {
padding: 0;
margin: 0;

& .link {
border: 1px solid @text-color-white;
color: #fff;
box-shadow: 0 0 6px white;
list-style-type: none;
text-transform: uppercase;
max-width: 150px;
margin: 20px auto 0;
padding: 10px;
.font-size(1);
}
}
}
}
}

.mounted {
.mobile,
.intro {
opacity: 1;
}
}

#HOME {
&.invisible {
& .introduction {
opacity: 0;
}
}
}
Loading

0 comments on commit 42438ff

Please sign in to comment.