diff --git a/apps/web-main/src/components/Nav/index.less b/apps/web-main/src/components/Nav/index.less deleted file mode 100644 index 78b2af0..0000000 --- a/apps/web-main/src/components/Nav/index.less +++ /dev/null @@ -1,73 +0,0 @@ -header { - position: fixed; - left: 0; - right: 0; - z-index: 19; - height: 60px; - background: #24292f; - color: #d7d7d7; - - nav { - display: grid; - grid-template-columns: 1fr 4fr 1fr; - align-items: center; - height: 100%; - - .start { - display: flex; - align-items: center; - - svg { - cursor: pointer; - width: 28px; - } - - span { - cursor: pointer; - padding-left: 10px; - font-size: 20px; - font-family: "bs"; - } - } - - .middle { - display: flex; - align-items: center; - - > span { - color: #d7d7d7; - text-decoration: none; - cursor: pointer; - margin-right: 30px; - - &:hover { - color: #fff; - } - - &.arco-input-inner-wrapper { - border: 0; - } - } - } - - .end { - text-align: right; - - span { - cursor: pointer; - margin-left: 32px; - - &:hover { - color: #fff; - } - } - } - } -} - -.sms-group { - display: grid; - grid-template-columns: 2fr 1fr; - column-gap: 10px; - align-items: center; -} diff --git a/apps/web-main/src/view/CourseDetail/components/Material/index.tsx b/apps/web-main/src/view/CourseDetail/components/Material/index.tsx deleted file mode 100644 index 917bc71..0000000 --- a/apps/web-main/src/view/CourseDetail/components/Material/index.tsx +++ /dev/null @@ -1,5 +0,0 @@ -function Material() { - return
1
; -} - -export default Material; diff --git a/apps/web/.drone.yml b/apps/web/.drone.yml new file mode 100644 index 0000000..9dcc08e --- /dev/null +++ b/apps/web/.drone.yml @@ -0,0 +1,18 @@ +--- +kind: pipeline +type: exec +name: backset.cn-web dev publish + +steps: + - name: 依赖更新 + commands: + - pnpm i + + - name: vite构建 + commnads: + - pnpm build + + - name: 发布web服务器 + commands: + - ls + - cp -r dist/ /www/wwwroot/nginx/html/backset.cn \ No newline at end of file diff --git a/apps/web-main/.gitignore b/apps/web/.gitignore similarity index 100% rename from apps/web-main/.gitignore rename to apps/web/.gitignore diff --git a/apps/web-main/index.html b/apps/web/index.html similarity index 100% rename from apps/web-main/index.html rename to apps/web/index.html diff --git a/apps/web-main/package.json b/apps/web/package.json similarity index 92% rename from apps/web-main/package.json rename to apps/web/package.json index 215e2ed..e9f5ebf 100644 --- a/apps/web-main/package.json +++ b/apps/web/package.json @@ -1,5 +1,5 @@ { - "name": "@backset/web-main", + "name": "@backset/web", "private": true, "version": "0.0.0", "type": "module", @@ -17,7 +17,6 @@ "@ricons/fluent": "0.12.0", "@ricons/utils": "0.1.6", "dayjs": "1.11.7", - "identicon": "3.1.1", "dplayer": "1.27.1" }, "devDependencies": { diff --git a/apps/web/public/bg.avif b/apps/web/public/bg.avif new file mode 100644 index 0000000..26b7ce3 Binary files /dev/null and b/apps/web/public/bg.avif differ diff --git a/apps/web/public/bg2.avif b/apps/web/public/bg2.avif new file mode 100644 index 0000000..3ca7ca9 Binary files /dev/null and b/apps/web/public/bg2.avif differ diff --git a/apps/web-main/public/favicon.svg b/apps/web/public/favicon.svg similarity index 100% rename from apps/web-main/public/favicon.svg rename to apps/web/public/favicon.svg diff --git a/apps/web-main/public/hls.js b/apps/web/public/hls.js similarity index 100% rename from apps/web-main/public/hls.js rename to apps/web/public/hls.js diff --git a/apps/web-main/public/player/font/VideoJS.eot b/apps/web/public/player/font/VideoJS.eot similarity index 100% rename from apps/web-main/public/player/font/VideoJS.eot rename to apps/web/public/player/font/VideoJS.eot diff --git a/apps/web-main/public/player/font/VideoJS.svg b/apps/web/public/player/font/VideoJS.svg similarity index 100% rename from apps/web-main/public/player/font/VideoJS.svg rename to apps/web/public/player/font/VideoJS.svg diff --git a/apps/web-main/public/player/font/VideoJS.ttf b/apps/web/public/player/font/VideoJS.ttf similarity index 100% rename from apps/web-main/public/player/font/VideoJS.ttf rename to apps/web/public/player/font/VideoJS.ttf diff --git a/apps/web-main/public/player/font/VideoJS.woff b/apps/web/public/player/font/VideoJS.woff similarity index 100% rename from apps/web-main/public/player/font/VideoJS.woff rename to apps/web/public/player/font/VideoJS.woff diff --git a/apps/web-main/public/player/ie8/videojs-ie8.js b/apps/web/public/player/ie8/videojs-ie8.js similarity index 100% rename from apps/web-main/public/player/ie8/videojs-ie8.js rename to apps/web/public/player/ie8/videojs-ie8.js diff --git a/apps/web-main/public/player/ie8/videojs-ie8.min.js b/apps/web/public/player/ie8/videojs-ie8.min.js similarity index 100% rename from apps/web-main/public/player/ie8/videojs-ie8.min.js rename to apps/web/public/player/ie8/videojs-ie8.min.js diff --git a/apps/web-main/public/player/lang/ar.js b/apps/web/public/player/lang/ar.js similarity index 100% rename from apps/web-main/public/player/lang/ar.js rename to apps/web/public/player/lang/ar.js diff --git a/apps/web-main/public/player/lang/ba.js b/apps/web/public/player/lang/ba.js similarity index 100% rename from apps/web-main/public/player/lang/ba.js rename to apps/web/public/player/lang/ba.js diff --git a/apps/web-main/public/player/lang/bg.js b/apps/web/public/player/lang/bg.js similarity index 100% rename from apps/web-main/public/player/lang/bg.js rename to apps/web/public/player/lang/bg.js diff --git a/apps/web-main/public/player/lang/ca.js b/apps/web/public/player/lang/ca.js similarity index 100% rename from apps/web-main/public/player/lang/ca.js rename to apps/web/public/player/lang/ca.js diff --git a/apps/web-main/public/player/lang/cs.js b/apps/web/public/player/lang/cs.js similarity index 100% rename from apps/web-main/public/player/lang/cs.js rename to apps/web/public/player/lang/cs.js diff --git a/apps/web-main/public/player/lang/da.js b/apps/web/public/player/lang/da.js similarity index 100% rename from apps/web-main/public/player/lang/da.js rename to apps/web/public/player/lang/da.js diff --git a/apps/web-main/public/player/lang/de.js b/apps/web/public/player/lang/de.js similarity index 100% rename from apps/web-main/public/player/lang/de.js rename to apps/web/public/player/lang/de.js diff --git a/apps/web-main/public/player/lang/el.js b/apps/web/public/player/lang/el.js similarity index 100% rename from apps/web-main/public/player/lang/el.js rename to apps/web/public/player/lang/el.js diff --git a/apps/web-main/public/player/lang/en.js b/apps/web/public/player/lang/en.js similarity index 100% rename from apps/web-main/public/player/lang/en.js rename to apps/web/public/player/lang/en.js diff --git a/apps/web-main/public/player/lang/es.js b/apps/web/public/player/lang/es.js similarity index 100% rename from apps/web-main/public/player/lang/es.js rename to apps/web/public/player/lang/es.js diff --git a/apps/web-main/public/player/lang/fa.js b/apps/web/public/player/lang/fa.js similarity index 100% rename from apps/web-main/public/player/lang/fa.js rename to apps/web/public/player/lang/fa.js diff --git a/apps/web-main/public/player/lang/fi.js b/apps/web/public/player/lang/fi.js similarity index 100% rename from apps/web-main/public/player/lang/fi.js rename to apps/web/public/player/lang/fi.js diff --git a/apps/web-main/public/player/lang/fr.js b/apps/web/public/player/lang/fr.js similarity index 100% rename from apps/web-main/public/player/lang/fr.js rename to apps/web/public/player/lang/fr.js diff --git a/apps/web-main/public/player/lang/gl.js b/apps/web/public/player/lang/gl.js similarity index 100% rename from apps/web-main/public/player/lang/gl.js rename to apps/web/public/player/lang/gl.js diff --git a/apps/web-main/public/player/lang/he.js b/apps/web/public/player/lang/he.js similarity index 100% rename from apps/web-main/public/player/lang/he.js rename to apps/web/public/player/lang/he.js diff --git a/apps/web-main/public/player/lang/hr.js b/apps/web/public/player/lang/hr.js similarity index 100% rename from apps/web-main/public/player/lang/hr.js rename to apps/web/public/player/lang/hr.js diff --git a/apps/web-main/public/player/lang/hu.js b/apps/web/public/player/lang/hu.js similarity index 100% rename from apps/web-main/public/player/lang/hu.js rename to apps/web/public/player/lang/hu.js diff --git a/apps/web-main/public/player/lang/it.js b/apps/web/public/player/lang/it.js similarity index 100% rename from apps/web-main/public/player/lang/it.js rename to apps/web/public/player/lang/it.js diff --git a/apps/web-main/public/player/lang/ja.js b/apps/web/public/player/lang/ja.js similarity index 100% rename from apps/web-main/public/player/lang/ja.js rename to apps/web/public/player/lang/ja.js diff --git a/apps/web-main/public/player/lang/ko.js b/apps/web/public/player/lang/ko.js similarity index 100% rename from apps/web-main/public/player/lang/ko.js rename to apps/web/public/player/lang/ko.js diff --git a/apps/web-main/public/player/lang/nb.js b/apps/web/public/player/lang/nb.js similarity index 100% rename from apps/web-main/public/player/lang/nb.js rename to apps/web/public/player/lang/nb.js diff --git a/apps/web-main/public/player/lang/nl.js b/apps/web/public/player/lang/nl.js similarity index 100% rename from apps/web-main/public/player/lang/nl.js rename to apps/web/public/player/lang/nl.js diff --git a/apps/web-main/public/player/lang/nn.js b/apps/web/public/player/lang/nn.js similarity index 100% rename from apps/web-main/public/player/lang/nn.js rename to apps/web/public/player/lang/nn.js diff --git a/apps/web-main/public/player/lang/pl.js b/apps/web/public/player/lang/pl.js similarity index 100% rename from apps/web-main/public/player/lang/pl.js rename to apps/web/public/player/lang/pl.js diff --git a/apps/web-main/public/player/lang/pt-BR.js b/apps/web/public/player/lang/pt-BR.js similarity index 100% rename from apps/web-main/public/player/lang/pt-BR.js rename to apps/web/public/player/lang/pt-BR.js diff --git a/apps/web-main/public/player/lang/pt-PT.js b/apps/web/public/player/lang/pt-PT.js similarity index 100% rename from apps/web-main/public/player/lang/pt-PT.js rename to apps/web/public/player/lang/pt-PT.js diff --git a/apps/web-main/public/player/lang/ru.js b/apps/web/public/player/lang/ru.js similarity index 100% rename from apps/web-main/public/player/lang/ru.js rename to apps/web/public/player/lang/ru.js diff --git a/apps/web-main/public/player/lang/sk.js b/apps/web/public/player/lang/sk.js similarity index 100% rename from apps/web-main/public/player/lang/sk.js rename to apps/web/public/player/lang/sk.js diff --git a/apps/web-main/public/player/lang/sr.js b/apps/web/public/player/lang/sr.js similarity index 100% rename from apps/web-main/public/player/lang/sr.js rename to apps/web/public/player/lang/sr.js diff --git a/apps/web-main/public/player/lang/sv.js b/apps/web/public/player/lang/sv.js similarity index 100% rename from apps/web-main/public/player/lang/sv.js rename to apps/web/public/player/lang/sv.js diff --git a/apps/web-main/public/player/lang/tr.js b/apps/web/public/player/lang/tr.js similarity index 100% rename from apps/web-main/public/player/lang/tr.js rename to apps/web/public/player/lang/tr.js diff --git a/apps/web-main/public/player/lang/uk.js b/apps/web/public/player/lang/uk.js similarity index 100% rename from apps/web-main/public/player/lang/uk.js rename to apps/web/public/player/lang/uk.js diff --git a/apps/web-main/public/player/lang/vi.js b/apps/web/public/player/lang/vi.js similarity index 100% rename from apps/web-main/public/player/lang/vi.js rename to apps/web/public/player/lang/vi.js diff --git a/apps/web-main/public/player/lang/zh-CN.js b/apps/web/public/player/lang/zh-CN.js similarity index 100% rename from apps/web-main/public/player/lang/zh-CN.js rename to apps/web/public/player/lang/zh-CN.js diff --git a/apps/web-main/public/player/lang/zh-TW.js b/apps/web/public/player/lang/zh-TW.js similarity index 100% rename from apps/web-main/public/player/lang/zh-TW.js rename to apps/web/public/player/lang/zh-TW.js diff --git a/apps/web-main/public/player/libs/TXLivePlayer-1.2.3.min.js b/apps/web/public/player/libs/TXLivePlayer-1.2.3.min.js similarity index 100% rename from apps/web-main/public/player/libs/TXLivePlayer-1.2.3.min.js rename to apps/web/public/player/libs/TXLivePlayer-1.2.3.min.js diff --git a/apps/web-main/public/player/libs/dash.all.min.2.9.3.js b/apps/web/public/player/libs/dash.all.min.2.9.3.js similarity index 100% rename from apps/web-main/public/player/libs/dash.all.min.2.9.3.js rename to apps/web/public/player/libs/dash.all.min.2.9.3.js diff --git a/apps/web-main/public/player/libs/dash.all.min.4.5.2.js b/apps/web/public/player/libs/dash.all.min.4.5.2.js similarity index 100% rename from apps/web-main/public/player/libs/dash.all.min.4.5.2.js rename to apps/web/public/player/libs/dash.all.min.4.5.2.js diff --git a/apps/web-main/public/player/libs/dash.all.min.v3.1.3.js b/apps/web/public/player/libs/dash.all.min.v3.1.3.js similarity index 100% rename from apps/web-main/public/player/libs/dash.all.min.v3.1.3.js rename to apps/web/public/player/libs/dash.all.min.v3.1.3.js diff --git a/apps/web-main/public/player/libs/flv.min.1.5.js b/apps/web/public/player/libs/flv.min.1.5.js similarity index 100% rename from apps/web-main/public/player/libs/flv.min.1.5.js rename to apps/web/public/player/libs/flv.min.1.5.js diff --git a/apps/web-main/public/player/libs/flv.min.1.6.2.js b/apps/web/public/player/libs/flv.min.1.6.2.js similarity index 100% rename from apps/web-main/public/player/libs/flv.min.1.6.2.js rename to apps/web/public/player/libs/flv.min.1.6.2.js diff --git a/apps/web-main/public/player/libs/flv.min.1.6.3.js b/apps/web/public/player/libs/flv.min.1.6.3.js similarity index 100% rename from apps/web-main/public/player/libs/flv.min.1.6.3.js rename to apps/web/public/player/libs/flv.min.1.6.3.js diff --git a/apps/web-main/public/player/libs/hls.min.0.12.4.js b/apps/web/public/player/libs/hls.min.0.12.4.js similarity index 100% rename from apps/web-main/public/player/libs/hls.min.0.12.4.js rename to apps/web/public/player/libs/hls.min.0.12.4.js diff --git a/apps/web-main/public/player/libs/hls.min.0.13.2m.js b/apps/web/public/player/libs/hls.min.0.13.2m.js similarity index 100% rename from apps/web-main/public/player/libs/hls.min.0.13.2m.js rename to apps/web/public/player/libs/hls.min.0.13.2m.js diff --git a/apps/web-main/public/player/libs/hls.min.1.1.5.js b/apps/web/public/player/libs/hls.min.1.1.5.js similarity index 100% rename from apps/web-main/public/player/libs/hls.min.1.1.5.js rename to apps/web/public/player/libs/hls.min.1.1.5.js diff --git a/apps/web-main/public/player/libs/hls.min.1.1.6.js b/apps/web/public/player/libs/hls.min.1.1.6.js similarity index 100% rename from apps/web-main/public/player/libs/hls.min.1.1.6.js rename to apps/web/public/player/libs/hls.min.1.1.6.js diff --git a/apps/web-main/public/player/libs/vconsole.min.3.3.0.js b/apps/web/public/player/libs/vconsole.min.3.3.0.js similarity index 100% rename from apps/web-main/public/player/libs/vconsole.min.3.3.0.js rename to apps/web/public/player/libs/vconsole.min.3.3.0.js diff --git a/apps/web-main/public/player/tcplayer.min.css b/apps/web/public/player/tcplayer.min.css similarity index 100% rename from apps/web-main/public/player/tcplayer.min.css rename to apps/web/public/player/tcplayer.min.css diff --git a/apps/web-main/public/player/tcplayer.v4.7.2.min.js b/apps/web/public/player/tcplayer.v4.7.2.min.js similarity index 100% rename from apps/web-main/public/player/tcplayer.v4.7.2.min.js rename to apps/web/public/player/tcplayer.v4.7.2.min.js diff --git a/apps/web-main/public/player/tcplayer_pure.min.css b/apps/web/public/player/tcplayer_pure.min.css similarity index 100% rename from apps/web-main/public/player/tcplayer_pure.min.css rename to apps/web/public/player/tcplayer_pure.min.css diff --git a/apps/web-main/src/App.tsx b/apps/web/src/App.tsx similarity index 100% rename from apps/web-main/src/App.tsx rename to apps/web/src/App.tsx diff --git a/apps/web-main/src/assets/backset.woff b/apps/web/src/assets/backset.woff similarity index 100% rename from apps/web-main/src/assets/backset.woff rename to apps/web/src/assets/backset.woff diff --git a/apps/web-main/src/assets/base.less b/apps/web/src/assets/base.less similarity index 100% rename from apps/web-main/src/assets/base.less rename to apps/web/src/assets/base.less diff --git a/apps/web-main/src/components/Card/index.less b/apps/web/src/components/Card/index.less similarity index 100% rename from apps/web-main/src/components/Card/index.less rename to apps/web/src/components/Card/index.less diff --git a/apps/web-main/src/components/Card/index.tsx b/apps/web/src/components/Card/index.tsx similarity index 100% rename from apps/web-main/src/components/Card/index.tsx rename to apps/web/src/components/Card/index.tsx diff --git a/apps/web/src/components/Nav/index.less b/apps/web/src/components/Nav/index.less new file mode 100644 index 0000000..829e734 --- /dev/null +++ b/apps/web/src/components/Nav/index.less @@ -0,0 +1,329 @@ +header { + position: fixed; + left: 0; + right: 0; + z-index: 19; + height: 60px; + background: #24292f; + color: #d7d7d7; + + nav { + display: grid; + grid-template-columns: 1fr 4fr 1fr; + align-items: center; + height: 100%; + + .start { + display: flex; + align-items: center; + + svg { + cursor: pointer; + width: 28px; + } + + span { + cursor: pointer; + padding-left: 10px; + font-size: 20px; + font-family: "bs"; + } + } + + .middle { + display: flex; + align-items: center; + + > span { + color: #d7d7d7; + text-decoration: none; + cursor: pointer; + margin-right: 30px; + + &:hover { + color: #fff; + } + + &.arco-input-inner-wrapper { + border: 0; + } + } + } + + .end { + text-align: right; + + span { + cursor: pointer; + margin-left: 32px; + + &:hover { + color: #fff; + } + } + } + } +} + +.arco-modal { + background: transparent; + .arco-modal-content { + padding: 0; + } +} + +.form-structor { + height: 550px; + position: relative; + overflow: hidden; + border-radius: 8px; + + &::after { + content: ""; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + opacity: 0.8; + background-repeat: no-repeat; + background-position: left bottom; + background-size: 500px; + background-image: url("/bg2.avif"); + } + + .login-sms { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 65%; + z-index: 5; + transition: all 0.3s ease; + + &.slide-up { + top: 5%; + transform: translate(-50%, 0%); + transition: all 0.3s ease; + } + + &.slide-up .form-holder, + &.slide-up .submit-btn { + opacity: 0; + visibility: hidden; + } + + &.slide-up .form-title { + font-size: 1em; + cursor: pointer; + } + + &.slide-up .form-title span { + margin-right: 5px; + opacity: 1; + visibility: visible; + transition: all 0.3s ease; + } + + .form-title { + color: #fff; + font-size: 22px; + text-align: center; + font-weight: 400; + + span { + color: rgba(0, 0, 0, 0.4); + opacity: 0; + visibility: hidden; + transition: all 0.3s ease; + } + } + + .sms-group { + display: flex; + align-items: center; + button { + height: 48px; + } + } + + .form-holder { + border-radius: 6px; + background-color: #fff; + overflow: hidden; + margin-top: 50px; + opacity: 1; + visibility: visible; + transition: all 0.3s ease; + + .input { + border: 0; + outline: none; + box-shadow: none; + display: block; + height: 48px; + line-height: 48px; + padding: 4px 15px; + border-bottom: 1px solid #eee; + width: 100%; + font-size: 14px; + + &:last-child { + border-bottom: 0; + } + &::input-placeholder { + color: rgba(0, 0, 0, 0.4); + } + } + } + + .submit-btn { + background-color: rgba(0, 0, 0, 0.4); + color: #fff; + border: 0; + border-radius: 6px; + margin: 15px auto; + padding: 15px 45px; + width: 100%; + cursor: pointer; + letter-spacing: 10px; + transition: all 0.3s ease; + + &:hover { + transition: all 0.3s ease; + background-color: rgba(0, 0, 0, 0.6); + } + } + } + + .login-pass { + position: absolute; + top: 20%; + left: 0; + right: 0; + bottom: 0; + background-color: #fff; + z-index: 5; + transition: all 0.3s ease; + + &::before { + content: ""; + position: absolute; + left: 50%; + top: -20px; + transform: translate(-50%, 0); + background-color: #fff; + width: 200%; + height: 250px; + border-radius: 50%; + z-index: 4; + transition: all 0.3s ease; + } + + .center { + position: absolute; + top: calc(50% - 10%); + left: 50%; + transform: translate(-50%, -50%); + width: 65%; + z-index: 5; + transition: all 0.3s ease; + + .form-title { + color: #000; + font-weight: 400; + font-size: 1.7em; + text-align: center; + + span { + color: rgba(0, 0, 0, 0.4); + opacity: 0; + visibility: hidden; + transition: all 0.3s ease; + } + } + + .form-holder { + border-radius: 8px; + background-color: #fff; + border: 1px solid #eee; + overflow: hidden; + margin-top: 50px; + opacity: 1; + visibility: visible; + transition: all 0.3s ease; + + .input { + border: 0; + outline: none; + box-shadow: none; + display: block; + height: 48px; + line-height: 48px; + padding: 4px 15px; + border-bottom: 1px solid #eee; + width: 100%; + font-size: 14px; + + &:last-child { + border-bottom: 0; + } + &::input-placeholder { + color: rgba(0, 0, 0, 0.4); + } + } + } + + .submit-btn { + background-color: rgb(107, 146, 164); + color: #fff; + border: 0; + border-radius: 6px; + margin: 15px auto; + padding: 15px 45px; + width: 100%; + letter-spacing: 10px; + cursor: pointer; + opacity: 1; + transition: all 0.3s ease; + + &:hover { + transition: all 0.3s ease; + background-color: rgba(107, 146, 164, 0.8); + } + } + } + + &.slide-up { + top: 90%; + transition: all 0.3s ease; + } + + &.slide-up .center { + top: 10%; + transform: translate(-50%, 0%); + transition: all 0.3s ease; + } + + &.slide-up .form-holder, + &.slide-up .submit-btn { + opacity: 0; + visibility: hidden; + transition: all 0.3s ease; + } + + &.slide-up .form-title { + font-size: 1em; + margin: 0; + padding: 0; + cursor: pointer; + } + + &.slide-up .form-title span { + margin-right: 5px; + opacity: 1; + visibility: visible; + transition: all 0.3s ease; + } + } +} diff --git a/apps/web-main/src/components/Nav/index.tsx b/apps/web/src/components/Nav/index.tsx similarity index 63% rename from apps/web-main/src/components/Nav/index.tsx rename to apps/web/src/components/Nav/index.tsx index 29c8dfc..0ae447f 100644 --- a/apps/web-main/src/components/Nav/index.tsx +++ b/apps/web/src/components/Nav/index.tsx @@ -11,16 +11,13 @@ import { Radio, Tooltip, } from "@arco-design/web-react"; -import FormItem from "@arco-design/web-react/es/Form/form-item"; const InputSearch = Input.Search; const RadioGroup = Radio.Group; import { useEffect, useRef, useState } from "react"; -import Row from "@arco-design/web-react/es/Table/summary/row"; -import Col from "@arco-design/web-react/es/Grid/col"; type TLoginMethod = "usePass" | "useSms"; -const DURATION = 120; // 验证码倒计时 +const DURATION = 3; // 验证码倒计时 function Nav() { const navigate = useNavigate(); @@ -31,17 +28,6 @@ function Nav() { let [countdown, setCountdown] = useState(DURATION); const timer = useRef(); - const onOk = () => { - loginForm.validate().then((res) => { - setConfirmLoading(true); - setTimeout(() => { - Message.success("Success !"); - setVisible(false); - setConfirmLoading(false); - }, 1500); - }); - }; - const onClickSmsBtn = () => { setTimeout(() => { Message.success("验证码已发送"); @@ -85,54 +71,73 @@ function Nav() {
setVisible(true)}>登录 setLoginMethod(e)} - > - 验证码 - 密码 - - } - style={{ width: "360px" }} + style={{ width: "350px" }} visible={visible} - onOk={onOk} - okText="登录" - cancelText="取消" closeIcon={false} + footer={null} confirmLoading={confirmLoading} onCancel={() => setVisible(false)} > -
- - - - {loginMethod === "useSms" ? ( - +
+
+

setLoginMethod("useSms")} + > + 验证码登录{" "} +

+
+
- -
- - ) : ( - - - - )} - +
+ +
+ {/* 密码 */} +
+
+

setLoginMethod("usePass")} + > + 密码登录 +

+
+ + +
+ +
+
+
diff --git a/apps/web-main/src/components/Nav/loginModal.tsx b/apps/web/src/components/Nav/loginModal.tsx similarity index 100% rename from apps/web-main/src/components/Nav/loginModal.tsx rename to apps/web/src/components/Nav/loginModal.tsx diff --git a/apps/web-main/src/hook/index.tsx b/apps/web/src/hook/index.tsx similarity index 100% rename from apps/web-main/src/hook/index.tsx rename to apps/web/src/hook/index.tsx diff --git a/apps/web-main/src/main.tsx b/apps/web/src/main.tsx similarity index 100% rename from apps/web-main/src/main.tsx rename to apps/web/src/main.tsx diff --git a/apps/web-main/src/router/Guard.tsx b/apps/web/src/router/Guard.tsx similarity index 100% rename from apps/web-main/src/router/Guard.tsx rename to apps/web/src/router/Guard.tsx diff --git a/apps/web-main/src/router/index.tsx b/apps/web/src/router/index.tsx similarity index 100% rename from apps/web-main/src/router/index.tsx rename to apps/web/src/router/index.tsx diff --git a/apps/web-main/src/view/Course/components/Recommand/index.less b/apps/web/src/view/Course/components/Recommand/index.less similarity index 100% rename from apps/web-main/src/view/Course/components/Recommand/index.less rename to apps/web/src/view/Course/components/Recommand/index.less diff --git a/apps/web-main/src/view/Course/components/Recommand/index.tsx b/apps/web/src/view/Course/components/Recommand/index.tsx similarity index 100% rename from apps/web-main/src/view/Course/components/Recommand/index.tsx rename to apps/web/src/view/Course/components/Recommand/index.tsx diff --git a/apps/web-main/src/view/Course/components/Timeline/index.less b/apps/web/src/view/Course/components/Timeline/index.less similarity index 100% rename from apps/web-main/src/view/Course/components/Timeline/index.less rename to apps/web/src/view/Course/components/Timeline/index.less diff --git a/apps/web-main/src/view/Course/components/Timeline/index.tsx b/apps/web/src/view/Course/components/Timeline/index.tsx similarity index 98% rename from apps/web-main/src/view/Course/components/Timeline/index.tsx rename to apps/web/src/view/Course/components/Timeline/index.tsx index 8cbe0cf..e54b196 100644 --- a/apps/web-main/src/view/Course/components/Timeline/index.tsx +++ b/apps/web/src/view/Course/components/Timeline/index.tsx @@ -46,7 +46,7 @@ function Timeline(props: IProps) { const [timelineData, setTimelineData] = useState(filterYearOnce(props.data)); const cursorActiveRef = useRef(null); const cursorStaticRef = useRef(null); - const orbitRef = useRef(); + const orbitRef = useRef(null); /** * 点击打圈圈 cursorStatic diff --git a/apps/web-main/src/view/Course/index.less b/apps/web/src/view/Course/index.less similarity index 100% rename from apps/web-main/src/view/Course/index.less rename to apps/web/src/view/Course/index.less diff --git a/apps/web-main/src/view/Course/index.tsx b/apps/web/src/view/Course/index.tsx similarity index 100% rename from apps/web-main/src/view/Course/index.tsx rename to apps/web/src/view/Course/index.tsx diff --git a/apps/web-main/src/view/Course/mock.ts b/apps/web/src/view/Course/mock.ts similarity index 100% rename from apps/web-main/src/view/Course/mock.ts rename to apps/web/src/view/Course/mock.ts diff --git a/apps/web-main/src/view/CourseDetail/components/DPlayer/index.less b/apps/web/src/view/CourseDetail/components/DPlayer/index.less similarity index 100% rename from apps/web-main/src/view/CourseDetail/components/DPlayer/index.less rename to apps/web/src/view/CourseDetail/components/DPlayer/index.less diff --git a/apps/web-main/src/view/CourseDetail/components/DPlayer/index.tsx b/apps/web/src/view/CourseDetail/components/DPlayer/index.tsx similarity index 100% rename from apps/web-main/src/view/CourseDetail/components/DPlayer/index.tsx rename to apps/web/src/view/CourseDetail/components/DPlayer/index.tsx diff --git a/apps/web/src/view/CourseDetail/components/Material/index.tsx b/apps/web/src/view/CourseDetail/components/Material/index.tsx new file mode 100644 index 0000000..0236e5f --- /dev/null +++ b/apps/web/src/view/CourseDetail/components/Material/index.tsx @@ -0,0 +1,5 @@ +function Material() { + return
这里放课程资料。例如 指标 等文件下载
; +} + +export default Material; diff --git a/apps/web-main/src/view/CourseDetail/components/Player/index.less b/apps/web/src/view/CourseDetail/components/Player/index.less similarity index 100% rename from apps/web-main/src/view/CourseDetail/components/Player/index.less rename to apps/web/src/view/CourseDetail/components/Player/index.less diff --git a/apps/web-main/src/view/CourseDetail/components/Player/index.tsx b/apps/web/src/view/CourseDetail/components/Player/index.tsx similarity index 100% rename from apps/web-main/src/view/CourseDetail/components/Player/index.tsx rename to apps/web/src/view/CourseDetail/components/Player/index.tsx diff --git a/apps/web-main/src/view/CourseDetail/index.less b/apps/web/src/view/CourseDetail/index.less similarity index 100% rename from apps/web-main/src/view/CourseDetail/index.less rename to apps/web/src/view/CourseDetail/index.less diff --git a/apps/web-main/src/view/CourseDetail/index.tsx b/apps/web/src/view/CourseDetail/index.tsx similarity index 87% rename from apps/web-main/src/view/CourseDetail/index.tsx rename to apps/web/src/view/CourseDetail/index.tsx index 8dffa11..2d79e8d 100644 --- a/apps/web-main/src/view/CourseDetail/index.tsx +++ b/apps/web/src/view/CourseDetail/index.tsx @@ -15,9 +15,23 @@ function CourseDetail() { { title: "资料下载", level: 2, - active: false, + active: true, view: , }, + { + title: "第一讲：特殊K线的量化描述", + level: 2, + time: "00:14:05", + active: false, + view: ( + + ), + }, { title: "学习 html, css, javascript 前的准备", level: 2, @@ -98,7 +112,7 @@ function CourseDetail() { size={0.2} panes={[