Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/login #16

Open
wants to merge 30 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0bb86d3
feature: Login 화면
hongSso Aug 17, 2022
5251c62
wip: 로그인 화면
hongSso Aug 18, 2022
7884d08
chore: 테스트 커밋
minuxx Aug 20, 2022
e93959e
chore: 소스트리 테스트커밋
minukyu Aug 20, 2022
a144707
chore: 주석 제거
minuxx Aug 20, 2022
745cbe4
wip: Login 화면
hongSso Aug 20, 2022
91fc685
Merge branch 'feature/login' of https://github.com/Soongsil-Universit…
hongSso Aug 20, 2022
81cd6db
wip: 로그인 상태값 변경테스트
minukyu Aug 20, 2022
dbdc05f
wip: 로그인 상태 값에 따른 컴포넌트 전환
hongSso Aug 20, 2022
74edeb8
wip: 쏘작업물 병합
minuxx Aug 20, 2022
9cd5b5d
wip: 로그인 컴포넌트 전환 구조
hongSso Aug 20, 2022
335a12b
wip: 깃 충돌 수정
hongSso Aug 20, 2022
fbf7113
feature/map
moana16 Aug 24, 2022
86bfdf8
wip: 로그인 컴포넌트 전환
hongSso Aug 25, 2022
c4d3ec6
feature: 'nickname, phone number' input form 생성
hongSso Aug 28, 2022
ebf0935
wip: 로그인 오류 메세지 출력 화면
hongSso Aug 30, 2022
4440331
feature/map
moana16 Aug 31, 2022
ab79764
feature/map
moana16 Aug 31, 2022
9a5ab74
feature/map
moana16 Aug 31, 2022
8097b64
fix: kakao map error
11t518s Aug 31, 2022
d6cb301
fix: delete code
11t518s Aug 31, 2022
4fdfe32
feature/map
moana16 Sep 23, 2022
5719238
feature/map
moana16 Sep 23, 2022
ed0c469
add https settings
11t518s Sep 24, 2022
e8f01c8
Merge pull request #19 from Soongsil-University-MakeUs-Challenge/setH…
11t518s Sep 24, 2022
00ddda0
Merge branch 'main' of https://github.com/Soongsil-University-MakeUs-…
minuxx Sep 24, 2022
f17b701
feat: 먼지 마커 렌더링 (더미데이터)
minuxx Sep 24, 2022
a4a0c12
feat: 닉네임 벨리데이션 추가
minuxx Sep 24, 2022
c1b066e
wip: 라우팅 작업
hongSso Sep 24, 2022
40bc523
wip: 로그인 뷰 로직 완성
hongSso Sep 24, 2022
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
64 changes: 64 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/stardustclient.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

94 changes: 94 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions apis/index.js
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
export {};
import axios from "axios";

export const starDustAPI = axios.create({
baseURL: 'https://star-dust.shop',
headers: {
accept: "application/json",
"Content-Type": "application/json",
"Access-Control-Allow-Origin": "*",
// "ACCESS-TOKEN": getToken() ?? ''
},
});

export async function login(nickname, phoneNumer) {
return await starDustAPI.post('/login', { nickname, phoneNumer })
}
17 changes: 17 additions & 0 deletions apis/service.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import axios from "axios";

// export const getToken = () => localStorage.getItem('access_token') ?? null

export const statDustAPI = axios.create({
baseURL: '',
headers: {
accept: "application/json",
"Content-Type": "application/json",
"Access-Control-Allow-Origin": "*",
// "ACCESS-TOKEN": getToken() ?? ''
},
});

export async function getDusts(university) {
return await statDustAPI.get(`/map/${university}`)
}
Binary file added image/img-dust-black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions init-https.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

MKCERT_INSTALLED=$(which mkcert)

if [ -z $MKCERT_INSTALLED ];then
brew install mkcert
fi

mkcert -install
mkcert localhost
Loading