Merge pull request #24 from TeamGrabit/develop

Release v1.0.1

.gitignore

@@ -2,3 +2,4 @@
 # /public/build/
 
 .DS_Store
+.env

package.json

@@ -6,12 +6,14 @@
     "build": "rollup -c",
     "dev": "rollup -c -w",
     "start": "sirv public --no-clear",
-	"release": "git push origin `git subtree split --prefix public/ main`:gh-pages --force"
+    "release": "git push origin `git subtree split --prefix public/ main`:gh-pages --force"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^17.0.0",
     "@rollup/plugin-node-resolve": "^11.0.0",
+    "@rollup/plugin-replace": "^3.1.0",
     "autoprefixer": "^10.4.2",
+    "dotenv": "^16.0.0",
     "node-sass": "^7.0.1",
     "postcss": "^8.4.6",
     "rollup": "^2.67.0",

rollup.config.js

@@ -5,7 +5,10 @@ import livereload from 'rollup-plugin-livereload';
 import { terser } from 'rollup-plugin-terser';
 import css from 'rollup-plugin-css-only';
 import sveltePreprocess from 'svelte-preprocess';
+import replace from '@rollup/plugin-replace';
+import dotenv from 'dotenv';
 
+dotenv.config();
 const production = !process.env.ROLLUP_WATCH;
 
 function serve() {
@@ -38,6 +41,11 @@ export default {
 		file: 'public/build/bundle.js'
 	},
 	plugins: [
+		replace({
+			ENV_API_URL: JSON.stringify(process.env.API_URL),
+			ENV_CALLBACK_URL: production? JSON.stringify(process.env.CALLBACK_URL) : JSON.stringify(process.env.CALLBACK_URL_LOCAL),
+			ENV_GIT_URL: JSON.stringify(process.env.GIT_URL)
+		}),
 		svelte({
 			compilerOptions: {
 				// enable run-time checks when not in production

src/common/Variable.js

@@ -1,3 +1,4 @@
-export const GIT_URL = 'https://github.com';
-export const API_URL = 'https://grabit.duckdns.org/api';
+export const GIT_URL = ENV_GIT_URL;
+export const API_URL = ENV_API_URL;
+export const CALLBACK_URL = ENV_CALLBACK_URL;
 export const ACCESS_TOKEN = 'accessToken';

src/pages/Home.svelte

@@ -7,6 +7,7 @@
 	import { user, getUser } from '../store/user.js';
 	import { changeTab } from '../store/page';
 	import { challengeList } from '../store/challenge.js';
+	import { ACCESS_TOKEN } from '../common/Variable';
 
 	let grass_list = new Array(365);
 	
@@ -17,7 +18,7 @@
 	// TODO: 유저별로 home을 만들지 자기 home만 보이게 할 것인지 회의 필요
 	beforeUpdate(() => {
 		if (!$user){
-			if(localStorage.getItem('accessToken')) getUser();
+			if(localStorage.getItem(ACCESS_TOKEN)) getUser();
 			else push('/login');
 		}
 	});

src/pages/Setting.svelte

@@ -5,7 +5,6 @@
 	let activeItem = -1;
 	function onClickItem(i) {
 		activeItem = i;
-		console.log(activeItem)
 	}
 	function setActive(i) {
 		if(i === activeItem) return true;

src/store/user.js

@@ -1,11 +1,11 @@
 import { writable } from 'svelte/store';
-import { ACCESS_TOKEN } from '../common/Variable';
+import { ACCESS_TOKEN, CALLBACK_URL } from '../common/Variable';
 import { fetchGet, fetchGetRedirectUrl, getQueryUri } from '../common/fetch';
 
 export const user = writable(null);
 
 export async function login() {
-	await fetchGetRedirectUrl(`oauth2/authorization/github?${getQueryUri({ 'redirect_uri' : 'http://localhost:5000/#/redirect'})}`, {redirect: 'manual'})
+	await fetchGetRedirectUrl(`oauth2/authorization/github?${getQueryUri({ 'redirect_uri' : CALLBACK_URL+'#/redirect'})}`, {redirect: 'manual'})
 }
 
 export function logout() {