- {label}
- {contents}
-
- )
-}
-
-export function getNextConcert(id, concertList) {
- const type = getConcert(id, concertList).type
- const list = concertList.filter((e) => {
- return e.type === type
- })
- // console.log(list)
- var next = undefined
- list.forEach((e, i) => {
- if (e.id === id) next = i + 1
- return
- })
- if (next > list.length - 1) {
- return false
- } else {
- // console.log('next', list[next].id)
- return list[next].id
- }
-}
-
-export function getPrevConcert(id, concertList) {
- const type = getConcert(id, concertList).type
- const list = concertList.filter((e) => {
- return e.type === type
- })
- var prev = undefined
- list.forEach((e, i) => {
- if (e.id === id) prev = i - 1
- return
- })
- if (prev < 0) {
- return false
- } else {
- // console.log('prev', list[prev].id)
- return list[prev].id
- }
-}
-
-// Audio.jsより
-export function getMediaData(id, number, concertList) {
- return getConcertList(id, concertList)[number]
-}
-
-export function getAlbum(id, playlist) {
- let album
- for (var i = 0; i < playlist.length; i++) {
- if (playlist[i].id === id) album = playlist[i]
- }
- return JSON.parse(JSON.stringify(album))
-}
-
-export function getAudioTitle(id, number, concertList) {
- return getConcertList(id, concertList)[number].title
-}
-
-export function getAudioComposer(id, number, concertList) {
- var list = getConcertList(id, concertList)[number]
- const composer =
- 'composer' in list ? (
- 'arranger' in list ? (
-
- {list.composer}
- {list.composer.match(/民謡/) ? '' : '作曲'}
- /
- {list.arranger}編曲
-
- ) : (
- {list.composer}
- )
- ) : 'arranger' in list ? (
- {list.arranger}編曲
- ) : (
- ''
- )
- return composer
- // 'composer' in data[ml] ? 'arranger' in data[ml] ? {data[ml].composer}{data[ml].composer.match(/民謡/) ? '' : '作曲'}/{data[ml].arranger}編曲 : {data[ml].composer} : ''
-}
-
-// module.exports = {
-// getVersion, getUserdata,
-// unixTimeFull, getYear, unixDate, unixTime, makeLine, playTime,
-// getMediaData,
-// getAudioTitle, getConcertTitle, getConcertType, getConcertMusicLabel,
-// getAudioComposer, getAudioComposerText, getAudioArrangerText,
-// getConcert, listReverse, labeling, escapeReg,
-// // for ConcertNavigation
-// getNextConcert, getPrevConcert
-// }
diff --git a/client/src/Component/Auth/Archive/Overview/Overview.js b/client/src/Component/Auth/Archive/Overview/Overview.js
deleted file mode 100644
index 9fb61de1..00000000
--- a/client/src/Component/Auth/Archive/Overview/Overview.js
+++ /dev/null
@@ -1,435 +0,0 @@
-import React, { Component } from 'react'
-import { Link } from 'react-router-dom'
-
-import { connect } from 'react-redux'
-
-import {
- setNavigationTitle,
- setNavigationTitleArchiveConcertid,
- setBackNavigation,
-} from '../../../../Actions/Navigation'
-import { getConcertList, setConcertid, getPhotoList, getVideoList } from '../../../../Actions/Archive'
-import { archivePlayRequest } from '../../../../Actions/Audio'
-
-import Forward from '../../../../Library/Icons/Forward'
-import Back from '../../../../Library/Icons/Back'
-import * as libArchive from '../Library/Library'
-import * as lib from '../../../../Library/Library'
-
-import './Overview.css'
-
-function mapStateToProps(state) {
- return {
- pc: state.status.pc,
- loadingArchive: state.archive.loading,
- concertList: state.archive.concertList,
- concertid: state.archive.concertid,
- loadingPhoto: state.archive.loadingPhoto,
- photoList: state.archive.photoList,
- loadingVideo: state.archive.loadingVideo,
- videoList: state.archive.videoList,
- }
-}
-
-function mapDispatchToProps(dispatch) {
- return {
- setNavigationTitle(title) {
- dispatch(setNavigationTitle(title))
- },
- setNavigationTitleArchiveConcertid(titleConcertid) {
- dispatch(setNavigationTitleArchiveConcertid(titleConcertid))
- },
- setBackNavigation(backNavigation, backNavigationPath) {
- dispatch(setBackNavigation(backNavigation, backNavigationPath))
- },
- getConcertList() {
- dispatch(getConcertList())
- },
- setConcertid(id) {
- dispatch(setConcertid(id))
- },
- getPhotoList() {
- dispatch(getPhotoList())
- },
- getVideoList() {
- dispatch(getVideoList())
- },
- archivePlayRequest(id, number, playRequest) {
- dispatch(archivePlayRequest(id, number, playRequest))
- },
- }
-}
-
-class Overview extends Component {
- constructor(props) {
- super(props)
- const { params } = this.props.match
- const id = params.id ? params.id : ''
- this.props.setConcertid(id)
- this.props.setNavigationTitleArchiveConcertid(id)
- }
-
- // 直接アクセスしたときに必要
- componentDidMount() {
- this.props.setNavigationTitle('詳細情報')
- this.props.setBackNavigation(true, '/archive')
- this.props.getConcertList()
- this.props.getPhotoList()
- this.props.getVideoList()
- }
-
- UNSAFE_componentWillReceiveProps(nextProps) {
- const { params } = nextProps.match
- if (params.id !== this.props.concertid) {
- this.props.setConcertid(params.id)
- this.props.setNavigationTitleArchiveConcertid(params.id)
- this.props.getPhotoList()
- this.props.getVideoList()
- }
- }
-
- componentWillUnmount() {
- this.props.setNavigationTitleArchiveConcertid(false)
- }
-
- showDate(item) {
- if (item.time['time'] && item.time['label']) {
- const time = (
-
-
- )
- return libArchive.labeling('日時', time)
- }
- const date = {item.time.date}
- {item.time.time + item.time.label}
- {item.time.date}
- return libArchive.labeling('開催日', date)
- }
-
- showPlace(item) {
- if ('place' in item) {
- const place = item.place.map((each, i) => {
- return {each}
- })
- return libArchive.labeling('会場', place)
- }
- }
-
- showConductor(item) {
- if ('conductor' in item) {
- var name = ''
- for (var i in item.conductor) {
- name += item.conductor[i].name + '・'
- }
- return libArchive.labeling('指揮', name.slice(0, -1))
- }
- }
-
- showGuest(item) {
- // ないときがある
- if (item['guest']) {
- // if ('guest' in item) {
- var list = ''
- for (var i in item.guest) {
- list = item.guest[i].name + '(' + item.guest[i].instrument + ')'
- }
- return libArchive.labeling('客演', list)
- }
- }
-
- setAudio(number) {
- this.props.archivePlayRequest(this.props.concertid, number, true)
- }
-
- showMusic(item) {
- var data = item.data
- return item.contents.map((list, i) => {
- var ml = list.music.map((ml, j) => {
- var composer =
- 'composer' in data[ml] ? (
- 'arranger' in data[ml] ? (
-
- {data[ml].composer}
- {data[ml].composer.match(/民謡/) ? '' : '作曲'}
- /
- {data[ml].arranger}編曲
-
- ) : (
- {data[ml].composer}
- )
- ) : 'arranger' in data[ml] ? (
- {data[ml].arranger}編曲
- ) : (
- ''
- )
- var additional =
- 'add' in data[ml] ? (
- -
- {data[ml].add.map((mv, k) => (
-
- {mv} - ))} -
-
- {data[ml].movement.map((mv, k) => (
-
- {mv} - ))} -
{hasAudio}
-
- {data[ml].title}
- {composer}
- {additional}
- {movement}
-
- - {ml}
-
- )
- }
- }
-
- renderConcertNavigation() {
- if (this.props.loadingArchive || !this.props.concertList || !this.props.concertid) return
- const item = libArchive.getConcert(this.props.concertid, this.props.concertList).detail
- const concertList = this.props.concertList
- const concertid = this.props.concertid
- // reverse()していないので逆になってる
- const prevClass =
- 'prev ' +
- libArchive.getPrevConcert(concertid, concertList) +
- ' ' +
- libArchive.getConcertType(concertid, concertList)
- const prevLink = libArchive.getPrevConcert(concertid, concertList) ? (
-
- 次
-
- ) : (
-
- 次
-
- )
- const nextClass =
- 'next ' +
- libArchive.getNextConcert(concertid, concertList) +
- ' ' +
- libArchive.getConcertType(concertid, concertList)
- const nextLink = libArchive.getNextConcert(concertid, concertList) ? (
-
- 前
-
- ) : (
-
- 前
-
- )
- return (
-
- NO IMAGE
-
-
- {nextLink}
-
- )
- }
-
- renderNavigationLink() {
- if (this.props.loadingArchive || !this.props.concertList || !this.props.concertid) return
- const photoLink = !this.props.photoList ? (
- {item.title}
- {prevLink} -
-
-
- 写真
-
-
-
-
- 写真
-
-
- 写真
-
-
-
-
-
- 映像
-
-
-
-
- 映像
-
-
- 映像
-
-
-
-
- )
- }
-
- renderConcertDetail() {
- if (this.props.loadingArchive || !this.props.concertList || !this.props.concertid)
- return (
-
-
- -
- {photoLink}
- {videoLink}
-
-
-
-
-
- )
- const item = libArchive.getConcert(this.props.concertid, this.props.concertList).detail
- return (
-
-
- )
- }
-
- renderBreadNavigation(loadingArchive, concertList, concertid) {
- if (loadingArchive || !concertList || !concertid)
- return (
- {this.showPoster(item)}
-
-
-
-
- {this.showDate(item)}
- {this.showPlace(item)}
- {this.showConductor(item)}
- {this.showGuest(item)}
-
- - {this.showMusic(item)}
- ホーム
-
- アーカイブ
-
-
-
- )
- return (
-
- ホーム
-
- アーカイブ
-
- {libArchive.getConcertTitle(concertid, concertList)}
-
- )
- }
-
- render() {
- // State List
- const { loadingArchive, concertList, concertid } = this.props
-
- const showBreadNavigation = this.renderBreadNavigation(loadingArchive, concertList, concertid)
-
- return (
-
- {showBreadNavigation}
-
-
- アーカイブ
-過去のウィンズの活動履歴を確認できます
-
-
-
-
- {this.renderConcertNavigation()}
- {this.renderNavigationLink()}
-
- {this.renderConcertDetail()}
-
-
-
-
- -
-
-
-
- -- -
- 一覧へ -
-
-
-
-
-
- )
- const photoList = this.props.photoList.map((each, i) => {
- return (
- this.openPhoto(i)}>
- 
-
- )
- })
- return {photoList}
- }
-
- renderBreadNavigation() {
- if (!this.props.concertList || !this.props.concertid) {
- return (
-
- ホーム
-
- アーカイブ
-
-
-
-
-
- )
- }
- return (
-
- ホーム
-
- アーカイブ
-
-
- {libArchive.getConcertTitle(this.props.concertid, this.props.concertList)}
-
-
- 写真
-
- )
- }
-
- render() {
- const showBreadNavigation = this.renderBreadNavigation()
- const showPhoto = this.renderPhoto()
-
- return (
-
- {showBreadNavigation}
-
-
- 写真
-過去のウィンズの活動履歴を確認できます
-{showPhoto}
-
-
-
-
-
- -
-
-
-
- -- -
- 一覧へ -
-
-
-
-
-
- )
- const photoList = this.props.photoList.map((each, i) => {
- return (
-
-
- )
- })
- const params = {
- spaceBetween: 45,
- grabCursor: true,
- navigation: {
- nextEl: '.swiper-custom-button-next',
- prevEl: '.swiper-custom-button-prev',
- },
- renderPrevButton: () => (
- this.props.setDisplayPhotoSlideModal(false, undefined)}>
- {/* e.stopPropagation()} /> */}
- ![]()
e.stopPropagation()}
- className="swiper-lazy"
- />
- {/* */}
- */}
-
-
-
-
- {/*
- {photoList}
-
- )
- }
-
- render() {
- if (!this.props.displayPhotoSlideModal) return
-
- const showPhotoSlide = this.renderPhotoSlide()
- const displayPhotoSlideModalClass = this.props.displayPhotoSlideModal ? ' open' : ''
-
- return (
-
-
- )
- }
-}
-
-const CustomButton = ({ className, children, pc }) => {
- return
-
- this.props.setDisplayPhotoSlideModal(false, undefined)}
- >
- ×
-
- {showPhotoSlide}
- this.props.setDisplayPhotoSlideModal(false, undefined)}
- >
- {children}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(PhotoSlide)
diff --git a/client/src/Component/Auth/Archive/PhotoSlide/PhotoSlide.scss b/client/src/Component/Auth/Archive/PhotoSlide/PhotoSlide.scss
deleted file mode 100644
index e2d190ea..00000000
--- a/client/src/Component/Auth/Archive/PhotoSlide/PhotoSlide.scss
+++ /dev/null
@@ -1,173 +0,0 @@
-.photo-slide-modal {
- .photo-slide-modal-contents {
- position: fixed;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background: #fff;
- z-index: 51;
- background: rgba(0, 0, 0, 0);
-
- // transition: transform .3s ease-in-out;
- transition: transform 0.2s ease-in-out;
- -webkit-transform: translate3d(0, 105%, 0);
- transform: translate3d(0, 105%, 0);
- -webkit-overflow-scrolling: touch;
-
- // &.pc {
- // width: 900px;
- // left: calc(50% - 450px);
- // }
-
- &.open {
- transition: transform 0.4s ease;
- -webkit-transform: translate3d(0, 0%, 0);
- transform: translate3d(0, 0%, 0);
- // box-shadow: 6px 0 25px rgba(0,0,0,.15);
-
- &.pc {
- // -webkit-transform: translateY(20%);
- // transform: translateY(20%);
- }
-
- .photo-slide-modal-close {
- position: fixed;
- top: calc(constant(safe-area-inset-top) + 12px);
- top: calc(env(safe-area-inset-top) + 12px);
- right: calc(constant(safe-area-inset-right) + 12px);
- right: calc(env(safe-area-inset-right) + 12px);
- width: 24px;
- padding: 4px;
- border-radius: 16px;
- text-align: center;
- color: #fff;
- font-size: 24px;
- line-height: 24px;
- cursor: pointer;
- z-index: 52;
-
- &:hover,
- &:active {
- background: rgba(255, 255, 255, 0.2);
- }
- }
- }
-
- .swiper-container {
- // background: rgba(0,0,0,.8);
-
- .swiper-custom-button-prev,
- .swiper-custom-button-next {
- position: absolute;
- top: 50%;
- width: 24px;
- height: 36px;
- margin-top: -18px;
- z-index: 10;
- color: #fff;
- font-size: 36px;
- cursor: pointer;
- background: none;
- opacity: 0.6;
-
- &.mobile {
- display: none;
- }
-
- &:hover {
- opacity: 0.8;
- }
-
- &.swiper-button-disabled {
- opacity: 0.35;
- cursor: auto;
- pointer-events: none;
- }
- }
-
- .swiper-custom-button-prev {
- left: 10px;
- right: auto;
- }
- .swiper-custom-button-next {
- right: 10px;
- left: auto;
- }
- }
-
- .archive-photo-slide {
- background: rgba(0, 0, 0, 0);
-
- .swiper-container {
- background: rgba(0, 0, 0, 0);
- .swiper-wrapper {
- background: rgba(0, 0, 0, 0);
- .swiper-slide {
- background: rgba(0, 0, 0, 0);
- }
- }
- }
-
- .each-original {
- width: 100%;
- height: 100vh;
- display: flex;
- align-items: center;
- justify-content: center;
- background: rgba(0, 0, 0, 0);
-
- img {
- display: block;
- width: 100%;
- max-width: 800px;
- height: auto;
- max-height: 100vh;
- object-fit: contain;
- z-index: 11;
- }
-
- .swiper-lazy-preloader {
- width: 36px;
- height: 36px;
- position: absolute;
- left: 50%;
- top: 50%;
- margin-left: -18px;
- margin-top: -18px;
- font-size: 36px;
- text-align: center;
- z-index: 10;
-
- -webkit-transform-origin: 50%;
- -ms-transform-origin: 50%;
- transform-origin: 50%;
- -webkit-animation: none;
- animation: none;
-
- &::after {
- display: none;
- }
- }
- }
- }
- }
-
- .photo-slide-modal-background {
- display: none;
- position: fixed;
- z-index: 50;
- top: 0;
- left: 0;
- width: 100vw;
- height: 100vh;
- background: black;
-
- &.open {
- display: block; /*カバーを表示*/
- opacity: 0.95;
- // transition: all 3s ease-in-out;
- // animation: menu-background-show .3s ease-in-out 0s;
- }
- }
-}
diff --git a/client/src/Component/Auth/Archive/Video/Video.js b/client/src/Component/Auth/Archive/Video/Video.js
deleted file mode 100644
index 5e5bdf99..00000000
--- a/client/src/Component/Auth/Archive/Video/Video.js
+++ /dev/null
@@ -1,380 +0,0 @@
-import React, { Component } from 'react'
-import { Link } from 'react-router-dom'
-
-import { connect } from 'react-redux'
-
-import { setNavigationTitle, setBackNavigation } from '../../../../Actions/Navigation'
-import {
- getConcertList,
- setConcertid,
- getVideoList,
- resetVideo,
- setVideoRef,
- setLoadingVideoSource,
- videoLoadPercentUpdate,
- videoPlayUpdate,
- videoPlayRequest,
- videoPlay,
- videoPause,
- videoStop,
- // setDisplayVideoController,
- countUp,
-} from '../../../../Actions/Archive'
-
-import Back from '../../../../Library/Icons/Back'
-import * as libArchive from '../Library/Library'
-import * as lib from '../../../../Library/Library'
-
-import './Video.css'
-
-function mapStateToProps(state) {
- return {
- pc: state.status.pc,
-
- loading: state.archive.loading,
- concertList: state.archive.concertList,
- concertid: state.archive.concertid,
-
- loadingVideo: state.archive.loadingVideo,
-
- videoList: state.archive.videoList,
- videoBaseSrc: state.archive.videoBaseSrc,
- videoUrl: state.archive.videoUrl,
- videoPoster: state.archive.videoPoster,
-
- videoRef: state.archive.videoRef,
-
- displayPhotoController: state.archive.displayPhotoController,
-
- videoPlayStatus: state.archive.videoPlayStatus,
- videoPlayTrack: state.archive.videoPlayTrack,
-
- countFlag: state.archive.countFlag,
- }
-}
-
-function mapDispatchToProps(dispatch) {
- return {
- setNavigationTitle(title) {
- dispatch(setNavigationTitle(title))
- },
- setBackNavigation(backNavigation, backNavigationPath) {
- dispatch(setBackNavigation(backNavigation, backNavigationPath))
- },
- getConcertList() {
- dispatch(getConcertList())
- },
- setConcertid(id) {
- dispatch(setConcertid(id))
- },
- getVideoList() {
- dispatch(getVideoList())
- },
- resetVideo() {
- dispatch(resetVideo())
- },
- setVideoRef(videoRef) {
- dispatch(setVideoRef(videoRef))
- },
- setLoadingVideoSource(status) {
- dispatch(setLoadingVideoSource(status))
- },
- videoLoadPercentUpdate(percent) {
- dispatch(videoLoadPercentUpdate(percent))
- },
- videoPlayUpdate(videoCurrent, videoDuration) {
- dispatch(videoPlayUpdate(videoCurrent, videoDuration))
- },
- videoPlayRequest(number, request) {
- dispatch(videoPlayRequest(number, request))
- },
- videoPlay(e) {
- dispatch(videoPlay(e))
- },
- videoPause(e) {
- dispatch(videoPause(e))
- },
- videoStop(e) {
- dispatch(videoStop(e))
- },
- // setDisplayVideoController (displayVideoSlideModal, videoNumber) {
- // dispatch(setDisplayVideoController(displayVideoSlideModal, videoNumber))
- // },
- countUp() {
- dispatch(countUp())
- },
- }
-}
-
-class Video extends Component {
- constructor(props) {
- super(props)
- const { params } = this.props.match
- const id = params.id ? params.id : ''
- const track = !isNaN(params.track) ? parseInt(params.track) : undefined
- this.props.setConcertid(id)
- id !== ''
- ? this.props.setBackNavigation(true, '/archive/overview/' + id)
- : this.props.setBackNavigation(true, '/archive')
- track ? this.props.videoPlayRequest(track, false) : false
- }
-
- UNSAFE_componentWillMount() {
- this.props.getVideoList()
- }
-
- // 直接アクセスしたときに必要
- componentDidMount() {
- this.props.setNavigationTitle('映像')
- // パンくずリスト用
- this.props.getConcertList()
- }
-
- UNSAFE_componentWillReceiveProps(nextProps) {
- const { params } = nextProps.match
- params.id ? this.props.setConcertid(params.id) : false
- }
-
- componentWillUnmount() {
- // this.props.videoStop()
- this.props.resetVideo()
- this.props.setVideoRef(undefined)
- }
-
- onLoadStart() {
- // console.log('読み込み開始', e)
- if (this.props.videoRef.src) {
- this.props.setLoadingVideoSource(true)
- }
- }
-
- onLoadedMetadata(e) {
- if (!isNaN(e.target.duration)) {
- this.props.videoPlayUpdate(this.props.current, e.target.duration)
- } else {
- this.props.videoPlayUpdate(this.props.current, undefined)
- }
- }
-
- onLoadedData(e) {
- if (!isNaN(e.target.duration)) {
- this.props.videoPlayUpdate(this.props.current, e.target.duration)
- } else {
- this.props.videoPlayUpdate(this.props.current, undefined)
- }
- }
-
- onDurationChange(e) {
- if (!isNaN(e.target.duration)) {
- this.props.videoPlayUpdate(this.props.current, e.target.duration)
- } else {
- this.props.videoPlayUpdate(this.props.current, undefined)
- }
- }
-
- onProgress(e) {
- if (e.target.buffered.length > 0) {
- this.props.videoLoadPercentUpdate(
- Math.round((e.target.buffered.end(e.target.buffered.length - 1) / e.target.duration) * 1000) / 10
- )
- } else {
- this.props.videoLoadPercentUpdate(undefined)
- }
- }
-
- onCanPlayThrough() {
- this.props.setLoadingVideoSource(false)
- }
-
- onError() {
- this.props.setLoadingVideoSource(true)
- }
-
- onTimeUpdate(e) {
- if (!isNaN(e.target.duration)) {
- this.props.videoPlayUpdate(e.target.currentTime, e.target.duration)
- if (this.props.countFlag && e.target.currentTime > 0) {
- this.props.countUp()
- }
- } else {
- this.props.videoPlayUpdate(undefined, undefined)
- }
- }
-
- onEnded() {
- this.playNext()
- }
-
- playNext() {
- // 確認
- if (this.props.videoList.length > this.props.videoPlayTrack + 1) {
- // 次のトラックへ
- this.props.videoPlayRequest(this.props.videoPlayTrack + 1, true)
- } else {
- this.props.videoPause()
- }
- }
-
- onClick(e) {
- e.preventDefault()
- this.props.videoPlayStatus ? this.props.videoPause() : this.props.videoPlay()
- }
-
- renderVideoList() {
- if (this.props.loading || this.props.loadingVideo || !this.props.videoList)
- return (
-
-
-
-
-
- )
- const concert = libArchive.getConcert(this.props.concertid, this.props.concertList).detail
- // 初期値
- var trackCount = 0
- return concert.contents.map((item, i) => {
- // console.log(item)
- const trackList = item.music.map((num, i) => {
- // return this.renderTrack(num)
- const trackData = this.props.videoList.filter((e) => {
- return e.data === num
- })
- // console.log(trackData)
- return trackData.map((each, j) => {
- const trackNumber = trackCount
- trackCount += 1
- const title =
- each.data !== false
- ? libArchive.getAudioTitle(this.props.concertid, each.data, this.props.concertList)
- : each.title
- const addTitle = each.addtitle ? ' ' + each.addtitle : ''
- const composer =
- each.data !== false ? (
-
- {libArchive.getAudioComposer(this.props.concertid, each.data, this.props.concertList)}
-
- ) : each.composer ? (
- {each.composer}
- ) : (
- ''
- )
- const type = libArchive.getConcertType(this.props.concertid, this.props.concertList)
- return (
- this.props.videoPlayRequest(trackNumber, true)}
- >
- {/*
-
- )
- }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Video)
diff --git a/client/src/Component/Auth/Archive/VideoController/VideoController.js b/client/src/Component/Auth/Archive/VideoController/VideoController.js
deleted file mode 100644
index 362c6265..00000000
--- a/client/src/Component/Auth/Archive/VideoController/VideoController.js
+++ /dev/null
@@ -1,137 +0,0 @@
-import React, { Component } from 'react'
-
-import { connect } from 'react-redux'
-
-import * as lib from '../../../../Library/Library'
-import * as libArchive from '../../Archive/Library/Library'
-
-import { videoPlay, videoPause, videoStop } from '../../../../Actions/Archive'
-
-import './VideoController.css'
-// import lib from 'react-confirm-alert';
-
-function mapStateToProps(state) {
- return {
- pc: state.status.pc,
-
- concertList: state.archive.concertList,
-
- videoConcertid: state.archive.videoConcertid,
-
- videoRef: state.archive.videoRef,
- displayVideoController: state.archive.displayVideoController,
- loadingVideoSource: state.archive.loadingVideoSource,
- videoLoadPercent: state.archive.videoLoadPercent,
-
- videoCurrent: state.archive.videoCurrent,
- videoCurrentTime: state.archive.videoCurrentTime,
- videoDuration: state.archive.videoDuration,
- videoDurationTime: state.archive.videoDurationTime,
- videoPlayPercent: state.archive.videoPlayPercent,
-
- videoPlayStatus: state.archive.videoPlayStatus,
- }
-}
-
-function mapDispatchToProps(dispatch) {
- return {
- videoPlay(e) {
- dispatch(videoPlay(e))
- },
- videoPause(e) {
- dispatch(videoPause(e))
- },
- videoStop(e) {
- dispatch(videoStop(e))
- },
- }
-}
-
-class VideoController extends Component {
- constructor(props) {
- super(props)
- this.videoProgress = React.createRef()
- this.videoLoadProgress = React.createRef()
- }
-
- seekProgress(e) {
- const total = Math.round(this.props.videoRef.duration)
- if (!isNaN(total)) {
- // console.log(e.pageX, this.audioProgress.clientWidth)
- this.props.videoRef.currentTime = Math.round(total * (e.pageX / this.videoProgress.clientWidth))
- }
- }
-
- renderPlayTime() {
- if (this.props.videoCurrent && this.props.videoDuration) {
- return (
-
|
)/gi, '\n') - .replace(/>/gi, '>') - .replace(/</gi, '<') - return ( -
-
- )
- }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Home)
diff --git a/client/src/Component/Auth/BBS/Home/Home.scss b/client/src/Component/Auth/BBS/Home/Home.scss
deleted file mode 100644
index 38191b68..00000000
--- a/client/src/Component/Auth/BBS/Home/Home.scss
+++ /dev/null
@@ -1,136 +0,0 @@
-.bbs {
- width: 100%;
- // max-width: 600px;
- margin: 0 auto;
- // font-size: 13px;
-
- // background: #fff;
-
- // &.pc {
- // .contents-header {
- // h2 {
- // padding: 0 16px;
- // }
- // }
- // }
-
- // .contents-header {
- // margin: 0;
- // padding: 16px 0;
- // background: #fff;
-
- // h2 {
- // padding: 0 12px;
- // font-size: 16px;
- // font-weight: normal;
- // }
- // }
-
- .bbs-list {
- .bbs-item {
- padding: 12px;
- & {
- background: #f6f6f6;
- }
- @media (prefers-color-scheme: dark) {
- & {
- background: #333;
- }
- }
-
- &:not(:first-child) {
- margin-top: 12px;
- }
-
- .bbs-title {
- display: flex;
- align-items: center;
-
- .number {
- min-width: 20px;
- min-height: 20px;
- border-radius: 5px;
- padding: 4px 6px;
- text-align: center;
- line-height: 20px;
- font-size: 1em;
- font-weight: bold;
-
- & {
- background: rgba(150, 150, 150, 1);
- color: rgba(255, 255, 255, 1);
- }
- @media (prefers-color-scheme: dark) {
- & {
- background: rgba(80, 80, 80, 1);
- color: rgba(150, 150, 150, 1);
- }
- }
- }
-
- .name {
- padding-left: 8px;
- font-size: 0.8rem;
- }
-
- .time {
- margin-left: auto;
- font-size: 0.8rem;
- color: #aaa;
- }
- }
-
- .bbs-text {
- margin-top: 8px;
- font-size: 0.9rem;
-
- p {
- margin: 0;
- padding: 0;
- }
- }
- }
-
- .more {
- margin: 12px 0 0;
- padding: 12px 0;
- font-size: 13px;
- text-align: center;
- text-transform: uppercase;
- cursor: pointer;
-
- & {
- color: #333;
- &:hover {
- color: #666;
- i {
- color: #666;
- }
- }
- i {
- color: #666;
- }
- }
- @media (prefers-color-scheme: dark) {
- & {
- color: #ccc;
- &:hover {
- color: #eee;
- i {
- color: #eee;
- }
- }
- i {
- color: #aaa;
- }
- }
- }
-
- i {
- display: block;
-
- font-size: 18px;
- }
- }
- }
-}
diff --git a/client/src/Component/Auth/BBS/Post/Post.js b/client/src/Component/Auth/BBS/Post/Post.js
deleted file mode 100644
index 1ae99a72..00000000
--- a/client/src/Component/Auth/BBS/Post/Post.js
+++ /dev/null
@@ -1,145 +0,0 @@
-import React, { Component } from 'react'
-import { Link } from 'react-router-dom'
-
-import { connect } from 'react-redux'
-
-import Back from '../../../../Library/Icons/Back'
-import * as lib from '../../../../Library/Library'
-
-import { setNavigationTitle, setBackNavigation } from '../../../../Actions/Navigation'
-import { setPostName, setPostText, setPostPass, sendPost, resetPost } from '../../../../Actions/BBS'
-
-import './Post.css'
-
-function mapStateToProps(state) {
- return {
- pc: state.status.pc,
-
- postName: state.bbs.postName,
- postText: state.bbs.postText,
- postPass: state.bbs.postPass,
-
- loadingPost: state.bbs.loadingPost,
- }
-}
-
-function mapDispatchToProps(dispatch) {
- return {
- setNavigationTitle(title) {
- dispatch(setNavigationTitle(title))
- },
- setBackNavigation(backNavigation, backNavigationPath) {
- dispatch(setBackNavigation(backNavigation, backNavigationPath))
- },
- setPostName(postName) {
- dispatch(setPostName(postName))
- },
- setPostText(postText) {
- dispatch(setPostText(postText))
- },
- setPostPass(postPass) {
- dispatch(setPostPass(postPass))
- },
- sendPost() {
- dispatch(sendPost())
- },
- resetPost() {
- dispatch(resetPost())
- },
- }
-}
-
-class Post extends Component {
- componentDidMount() {
- this.props.setNavigationTitle('書き込む')
- this.props.setBackNavigation(true, '/bbs')
- }
-
- // loadMore () {
- // setTimeout(() => {
- // const showCount = this.state.showCount + 5
- // const bbsList = this.state.bbsList.concat(this.props.list.list.slice(this.state.showCount, showCount))
- // console.log('load call', this.state.showCount, showCount, bbsList, showCount, this.props.list.list.length)
- // this.setState({bbsList, showCount})
- // if (showCount > this.props.list.list.length) this.setState({hasMore: false})
- // }, 100)
- // }
-
- render() {
- return (
-
-
this.selectPlay(trackNumber)}> */}
-
- )
- })
- })
- return (
-
-
-
-
- {title + addTitle}
- {composer}
-
-
-
- {trackList}
-
- )
- })
- }
-
- renderBreadNavigation() {
- if (!this.props.concertList || !this.props.concertid) {
- return (
-
- ホーム
-
- アーカイブ
-
-
-
-
-
- )
- }
- return (
-
- ホーム
-
- アーカイブ
-
-
- {libArchive.getConcertTitle(this.props.concertid, this.props.concertList)}
-
-
- 映像
-
- )
- }
-
- render() {
- const showBreadNavigation = this.renderBreadNavigation()
- const showVideoList = this.renderVideoList()
- const poster = this.props.videoPoster ? this.props.videoPoster : 'false'
- const aspectClass =
- this.props.videoPoster === 'https://video.winds-n.com/poster_800_586.png' ? ' aspect-4-3' : ' aspect-16-9'
- return (
-
- {showBreadNavigation}
-
-
- 映像
-
-
-
-
-
-
-
-
- {showVideoList}
-
-
-
-
- -
-
-
-
- -- -
- 一覧へ -
-
- {this.props.videoCurrentTime}
- {this.props.videoDurationTime}
-
- )
- } else {
- return (
-
- 00:00
- 00:00
-
- )
- }
- }
-
- render() {
- const displayVideoControllerClass = this.props.displayVideoController ? ' open' : ''
- const button = this.props.videoPlayStatus ? (
- !this.props.loadingVideoSource || this.props.videoCurrent || this.props.videoDuration ? (
-
- ) : (
-
- )
- ) : (
-
- )
- const playStatusClass = this.props.videoPlayStatus ? ' playing' : ''
- const playTime = this.renderPlayTime()
- const playProgress = this.props.videoPlayPercent
- ? { backgroundSize: this.props.videoPlayPercent + '% 100%' }
- : { backgroundSize: '0% 100%' }
- const loadProgress = this.props.videoLoadPercent
- ? { backgroundSize: this.props.videoLoadPercent + '% 100%' }
- : { backgroundSize: '0% 100%' }
- const playTypeClass =
- this.props.videoConcertid && this.props.concertList
- ? ' ' + libArchive.getConcertType(this.props.videoConcertid, this.props.concertList)
- : false
- return (
-
-
- )
- }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(VideoController)
diff --git a/client/src/Component/Auth/Auth.js b/client/src/Component/Auth/Auth.js
deleted file mode 100644
index 6016a762..00000000
--- a/client/src/Component/Auth/Auth.js
+++ /dev/null
@@ -1,149 +0,0 @@
-import React, { Component } from 'react'
-import { Route, Switch, Redirect } from 'react-router-dom'
-
-import { connect } from 'react-redux'
-import { loginAuth, windowWidthChange } from '../../Actions/Status'
-import { audioPlay, audioPause } from '../../Actions/Audio'
-
-import Home from './Home/Home'
-import Practice from './Practice/Practice'
-import Manager from './Manager/Manager'
-import BBS from './BBS/BBS'
-
-import Archive from './Archive/Archive'
-import ArchivePhotoSlide from './Archive/PhotoSlide/PhotoSlide'
-import ArchiveVideoController from './Archive/VideoController/VideoController'
-import Score from './Score/Score'
-import ScoreModal from './Score/ScoreModal/ScoreModal'
-import ScoreEditModal from './Score/EditModal/EditModal'
-import ScoreBoxModal from './Score/BoxModal/BoxModal'
-
-import Setting from './Setting/Setting'
-
-import Tutorial from './Tutorial/Tutorial'
-
-import NavigationHeader from './Component/NavigationHeader/NavigationHeader'
-import NavigationInline from './Component/NavigationInline/NavigationInline'
-
-import Audio from './Component/Audio/Audio'
-
-import Loading from '../Loading/Loading'
-
-import './Auth.css'
-
-function mapStateToProps(state) {
- return {
- login: state.status.login,
- loading: state.status.loading,
- pc: state.status.pc,
- contentsRef: state.status.contentsRef,
- displayPlayer: state.audio.displayPlayer,
- playStatus: state.audio.playStatus,
- }
-}
-
-function mapDispatchToProps(dispatch) {
- return {
- loginAuth(location) {
- dispatch(loginAuth(location))
- },
- windowWidthChange() {
- dispatch(windowWidthChange())
- },
- audioPlay() {
- dispatch(audioPlay())
- },
- audioPause() {
- dispatch(audioPause())
- },
- }
-}
-
-class Auth extends Component {
- constructor(props) {
- super(props)
- this.contentsRef = React.createRef()
- }
-
- UNSAFE_componentWillMount() {
- // 過去のlocation情報が存在する場合はそのページへRedirect
- this.props.loginAuth(window.localStorage.location ? window.localStorage.location : false)
- }
-
- UNSAFE_componentWillReceiveProps(nextProps) {
- if (this.props.location.pathname !== nextProps.location.pathname) {
- if (this.contentsRef) {
- if (this.contentsRef.scrollTop) {
- this.contentsRef.scrollTop = 0
- }
- }
- }
- }
-
- componentDidMount() {
- this.props.windowWidthChange()
- window.addEventListener('resize', () => {
- this.props.windowWidthChange()
- })
- }
-
- componentWillUnmount() {
- window.removeEventListener('resize', () => {})
- }
-
- onKeyPress(e) {
- if (!this.props.displayPlayer) return false
- if (e.target.tagName !== 'INPUT' && e.target.tagName !== 'TEXTAREA' && e.which === 32) {
- this.props.playStatus ? this.props.audioPause() : this.props.audioPlay()
- }
- }
-
- render() {
- const { login, loading, pc, displayPlayer } = this.props
- if (loading) return
-
-
-
- (this.videoProgress = i)}
- onClick={(e) => this.seekProgress(e)}
- >
- {playTime}
-
- (this.videoLoadProgress = i)}
- >
- this.onKeyPress(e)} tabIndex="0">
- {/*
- )
- }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Auth)
diff --git a/client/src/Component/Auth/Auth.scss b/client/src/Component/Auth/Auth.scss
deleted file mode 100644
index 7a758134..00000000
--- a/client/src/Component/Auth/Auth.scss
+++ /dev/null
@@ -1,686 +0,0 @@
-.auth {
- & {
- color: #333;
- }
- @media (prefers-color-scheme: dark) {
- & {
- color: #eee;
- }
- }
-
- .contents {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- display: block;
- margin: 44.5px 0 0 0;
-
- .contents-inner {
- height: 100%;
- overflow-x: hidden;
- overflow-y: scroll;
- -webkit-overflow-scrolling: touch;
- overflow-scrolling: touch;
- // Chromeだけっぽい
- // scroll-behavior: smooth;
- will-change: scroll-position;
- contain: size style layout;
- transform: translateZ(0); // Retinaスクロール対策
- }
-
- z-index: 1;
-
- transform: translateZ(0); // Retinaスクロール対策
-
- margin-top: calc(constant(safe-area-inset-top) + 44.5px);
- // margin-bottom: constant(safe-area-inset-bottom);
- margin-left: constant(safe-area-inset-left);
- margin-right: constant(safe-area-inset-right);
-
- margin-top: calc(env(safe-area-inset-top) + 44.5px);
- // margin-bottom: env(safe-area-inset-bottom);
- margin-left: env(safe-area-inset-left);
- margin-right: env(safe-area-inset-right);
-
- // background: rgba(220,220,220,.2);
- // background: #efeff4;
- // background: #f3f2f8;
- // background: rgb(230, 236, 240);
-
- & {
- background: #efeff4;
- }
- @media (prefers-color-scheme: dark) {
- & {
- background: #000;
- }
- }
-
- &.pc {
- margin: 61px 0 0 0;
- }
-
- // &.mobile {
- // margin-top: calc(12px + 45px);
- // }
-
- div.flex-frame {
- // menu: 240px, contents: 900px, margin: 16px * 4
- max-width: 1204px;
- margin: 0 auto;
-
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: flex-start;
- }
-
- // pcモードのとき追加
- .inline-contents {
- width: 900px;
- min-width: 0; // 長いテキストを表示したときに要素を可変にするため
- margin: 36px 16px 36px;
- }
-
- // mobileモードのとき追加
- .full-contents {
- margin: 32px 0;
- }
-
- .gap {
- height: calc(constant(safe-area-inset-bottom) + 65px);
- height: calc(env(safe-area-inset-bottom) + 65px);
- }
-
- .contents-header {
- margin: 0;
- padding: 12px 0;
-
- & {
- background: #fff;
- }
- @media (prefers-color-scheme: dark) {
- & {
- background: #1c1c1e;
- }
- }
-
- &.pc {
- padding: 16px 0;
-
- .bread-navigation {
- padding: 0 16px;
- font-size: 13px;
- }
-
- h2 {
- padding: 0 16px;
- }
-
- p {
- padding: 0 16px;
- }
- }
-
- &.mobile {
- & {
- border-top: 0.55px solid #cbcbcd;
- border-bottom: 0.55px solid #cbcbcd;
- }
- @media (prefers-color-scheme: dark) {
- & {
- border-top: 0.55px solid #2d2d2f;
- border-bottom: 0.55px solid #2d2d2f;
- }
- }
- }
-
- .bread-navigation {
- padding: 0 12px;
- font-size: 12px;
- color: #888;
-
- & {
- color: #888;
- }
- @media (prefers-color-scheme: dark) {
- & {
- color: #777;
- }
- }
-
- a {
- text-decoration: none;
-
- &:hover {
- text-decoration: underline;
- }
-
- & {
- color: #888;
- }
- @media (prefers-color-scheme: dark) {
- & {
- color: #777;
- }
- }
- }
-
- i {
- padding: 0 0.6em;
- font-size: 10px;
- }
-
- span {
- & {
- color: #666;
- }
- @media (prefers-color-scheme: dark) {
- & {
- color: #999;
- }
- }
- }
- }
-
- h2 {
- margin: 8px 0;
- padding: 0 12px;
- font-size: 16px;
- font-weight: normal;
- }
-
- p {
- margin: 0;
- padding: 0 12px;
- font-size: 0.9rem;
- }
- }
-
- .box-label {
- margin: 32px 0 11px;
- padding: 0 0 0 12px;
- font-size: 12px;
-
- & {
- color: #333;
- }
- @media (prefers-color-scheme: dark) {
- & {
- color: #ccc;
- }
- }
-
- & + .box {
- margin: 0 0 32px 0;
- }
-
- &.pc {
- padding: 0 0 0 16px;
- }
- }
-
- // 標準box
- .box {
- margin: 32px 0 32px 0;
- // padding: 12px 0 0;
-
- & {
- background: #fff;
- }
- @media (prefers-color-scheme: dark) {
- & {
- background: #1c1c1e;
- }
- }
-
- // &.box-no-background {
- // background: inherit;
- // }
-
- &.pc {
- .title-frame > label {
- padding: 8px 16px;
- font-size: 20px;
- }
-
- .text {
- // padding: 13px 16px 14px;
- padding: 16px;
- font-size: 1rem;
- }
-
- .link ul li a .inner {
- padding-left: 16px;
- }
-
- .link ul li .disabled-link .inner {
- padding-left: 16px;
- }
-
- .link ul li .link-button .inner {
- padding-left: 16px;
- }
-
- .back-link ul li a .inner {
- padding-left: 16px;
- }
- }
-
- &.mobile {
- & {
- border-top: 0.55px solid #cbcbcd;
- border-bottom: 0.55px solid #cbcbcd;
- }
- @media (prefers-color-scheme: dark) {
- & {
- border-top: 0.55px solid #2d2d2f;
- border-bottom: 0.55px solid #2d2d2f;
- }
- }
- }
-
- // border-top: .55px solid #c8c7cc;
- // border-bottom: .55px solid #c8c7cc;
-
- .title-frame {
- // タイトルSticky用
- // padding: 12px 0 0;
-
- & > label {
- display: block;
- // margin: 8px 0;
- // padding: 4px 0 4px 12px;
- padding: 0 12px;
- // border-bottom: .55px dotted #c8c7cc;
- font-size: 18px;
- letter-spacing: 0.1rem;
-
- & {
- background: #fff;
- border-bottom: 0.55px solid #cbcbcd;
- }
- @media (prefers-color-scheme: dark) {
- & {
- background: #1c1c1e;
- border-bottom: 0.55px solid #2d2d2f;
- }
- }
-
- // position: -webkit-sticky;
- // position: sticky;
- // top: 0;
-
- line-height: 44px;
- // position: relative;
- // border-bottom: .55px solid #c8c7cc;
-
- // &::before {
- // display: block;
- // content: '';
- // padding-top: 12px;
- // }
- }
- }
-
- .text {
- // padding: 13px 16px 14px;
- padding: 12px;
- font-size: 0.9rem;
-
- p {
- margin: 0;
- padding: 0;
- }
- }
-
- .link {
- font-size: 1rem;
-
- ul {
- margin: 0;
- padding: 0;
- // border-top: .55px solid #c8c7cc;
-
- li {
- list-style: none;
- // border-bottom: .55px solid #c8c7cc;
-
- a {
- display: block;
- margin: 0;
-
- text-decoration: none;
-
- & {
- color: #333;
-
- &:hover {
- background: #e6e5eb;
- }
-
- &:active {
- background: #e6e5eb;
- }
- }
- @media (prefers-color-scheme: dark) {
- & {
- color: #ccc;
-
- &:hover {
- background: #2c2c2e;
- }
-
- &:active {
- background: #2c2c2e;
- }
- }
- }
- }
-
- &.link {
- cursor: pointer;
- }
-
- .inner {
- padding-left: 12px;
- cursor: pointer;
-
- display: flex;
- justify-content: space-between;
- align-items: center;
-
- span {
- // margin: 11px 8px 11px 0;
- line-height: 44px;
- font-size: 16px;
- }
-
- i {
- padding-right: 12px;
- color: #666;
- font-size: 1.2rem;
- }
- }
-
- .disabled-link {
- display: block;
- margin: 0;
-
- text-decoration: none;
-
- & {
- color: #ccc;
- }
- @media (prefers-color-scheme: dark) {
- & {
- color: #333;
- }
- }
-
- .inner {
- display: flex;
- justify-content: space-between;
- align-items: center;
- cursor: default;
-
- span {
- // margin: 11px 8px 11px 0;
- line-height: 44px;
- font-size: 16px;
- }
-
- i {
- padding-right: 12px;
- color: #eee;
- font-size: 1.2rem;
- }
-
- svg {
- fill: #eee;
-
- & {
- fill: #eee;
- }
- @media (prefers-color-scheme: dark) {
- & {
- fill: #333;
- }
- }
- }
- }
- }
-
- .link-button {
- // padding-left: 12px;
- cursor: pointer;
-
- display: flex;
- justify-content: space-between;
- align-items: center;
-
- & {
- color: #333;
-
- &:hover {
- background: #e6e5eb;
- }
-
- &:active {
- background: #e6e5eb;
- }
- }
- @media (prefers-color-scheme: dark) {
- & {
- color: #ccc;
-
- &:hover {
- background: #2c2c2e;
- }
-
- &:active {
- background: #2c2c2e;
- }
- }
- }
- span {
- // margin: 11px 8px 11px 0;
- line-height: 44px;
- font-size: 16px;
- }
- }
- }
- }
- }
-
- &.back-to-home {
- padding: 0;
- // border: 0;
- }
-
- .back-link {
- font-size: 1rem;
- line-height: 1.6;
-
- ul {
- margin: 0;
- padding: 0;
- // border-top: .55px solid #c8c7cc;
-
- li {
- list-style: none;
- // border-bottom: .55px solid #c8c7cc;
-
- a {
- display: block;
- margin: 0;
-
- text-decoration: none;
-
- & {
- color: #333;
-
- &:hover {
- background: #e6e5eb;
- }
-
- &:active {
- background: #e6e5eb;
- }
- }
- @media (prefers-color-scheme: dark) {
- & {
- color: #ccc;
-
- &:hover {
- background: #2c2c2e;
- }
-
- &:active {
- background: #2c2c2e;
- }
- }
- }
-
- .inner {
- padding-left: 12px;
- display: flex;
- justify-content: flex-start;
- align-items: center;
-
- span {
- // margin: 11px 8px 11px 0;
- line-height: 44px;
- font-size: 16px;
- }
-
- i {
- padding-right: 8px;
- color: #666;
- font-size: 1.2rem;
- }
- }
- }
- }
- }
- }
- }
- }
-
- footer {
- width: 100%;
- margin: 48px 0;
- text-align: center;
- color: #888;
- }
-}
-
-.border-top {
- & {
- border-top: 0.55px solid #cbcbcd;
- }
- @media (prefers-color-scheme: dark) {
- & {
- border-top: 0.55px solid #2d2d2f;
- }
- }
-}
-
-.border-bottom {
- & {
- border-bottom: 0.55px solid #cbcbcd;
- }
- @media (prefers-color-scheme: dark) {
- & {
- border-bottom: 0.55px solid #2d2d2f;
- }
- }
-}
-
-.no-border-top {
- border-top: 0 !important;
-}
-
-.no-border-bottom {
- border-bottom: 0 !important;
-}
-
-.mobile {
- &.border-top-mobile {
- & {
- border-top: 0.55px solid #cbcbcd;
- }
- @media (prefers-color-scheme: dark) {
- & {
- border-top: 0.55px solid #2d2d2f;
- }
- }
- }
-
- &.border-bottom-mobile {
- & {
- border-bottom: 0.55px solid #cbcbcd;
- }
- @media (prefers-color-scheme: dark) {
- & {
- border-bottom: 0.55px solid #2d2d2f;
- }
- }
- }
-
- &.no-border-top-mobile {
- border-top: 0 !important;
- }
-
- &.no-border-bottom-mobile {
- border-bottom: 0 !important;
- }
-}
-
-.send-button {
- display: block;
- width: 100%;
- height: 44px;
- line-height: 44px;
- margin: 0 auto;
- padding: 0;
- border: none;
- color: rgba(182, 0, 5, 1);
- font-size: 16px;
- text-align: center;
- cursor: pointer;
- transition: all ease-in-out 0.2s;
-
- & {
- background: #fff;
-
- &:hover,
- &:focus {
- background: #e6e5eb;
- }
-
- &:active {
- background: #e6e5eb;
- }
- }
- @media (prefers-color-scheme: dark) {
- & {
- background: #1c1c1e;
-
- &:hover,
- &:focus {
- background: #2c2c2e;
- }
-
- &:active {
- background: #2c2c2e;
- }
- }
- }
-
- i {
- margin-right: 0.2em;
- }
-}
diff --git a/client/src/Component/Auth/BBS/BBS.js b/client/src/Component/Auth/BBS/BBS.js
deleted file mode 100644
index dbc5e61b..00000000
--- a/client/src/Component/Auth/BBS/BBS.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { Component } from 'react'
-import { Route, Switch, Link } from 'react-router-dom'
-
-import { connect } from 'react-redux'
-
-import Back from '../../../Library/Icons/Back'
-import * as lib from '../../../Library/Library'
-
-import Home from './Home/Home'
-import Post from './Post/Post'
-
-import './BBS.css'
-
-function mapStateToProps(state) {
- return {
- pc: state.status.pc,
- }
-}
-
-function mapDispatchToProps() {
- return {}
-}
-
-class Archive extends Component {
- render() {
- return (
-
-
-
- {
- this.contentsRef = i
- }}
- >
-
-
-
-
- {gap}
-
-
-
-
-
-
-
-
-
- )
- }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Archive)
diff --git a/client/src/Component/Auth/BBS/BBS.scss b/client/src/Component/Auth/BBS/BBS.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/client/src/Component/Auth/BBS/Home/Home.js b/client/src/Component/Auth/BBS/Home/Home.js
deleted file mode 100644
index 82d59c0b..00000000
--- a/client/src/Component/Auth/BBS/Home/Home.js
+++ /dev/null
@@ -1,169 +0,0 @@
-import React, { Component } from 'react'
-import { Link } from 'react-router-dom'
-
-import { connect } from 'react-redux'
-
-import * as lib from '../../../../Library/Library'
-
-import { setNavigationTitle, setBackNavigation } from '../../../../Actions/Navigation'
-import { getBBSList, loadMore } from '../../../../Actions/BBS'
-
-import { showToast } from '../../../../Actions/Toast'
-
-import Forward from '../../../../Library/Icons/Forward'
-
-import './Home.css'
-
-function mapStateToProps(state) {
- return {
- pc: state.status.pc,
-
- loading: state.bbs.loading,
- list: state.bbs.list,
- showList: state.bbs.showList,
- showMore: state.bbs.showMore,
- }
-}
-
-function mapDispatchToProps(dispatch) {
- return {
- setNavigationTitle(title) {
- dispatch(setNavigationTitle(title))
- },
- setBackNavigation(backNavigation, backNavigationPath) {
- dispatch(setBackNavigation(backNavigation, backNavigationPath))
- },
- getBBSList() {
- dispatch(getBBSList())
- },
-
- showToast(string) {
- dispatch(showToast(string))
- },
- loadMore() {
- dispatch(loadMore())
- },
- }
-}
-
-class Home extends Component {
- componentDidMount() {
- this.props.setNavigationTitle('会員専用掲示板')
- this.props.setBackNavigation(true, '/')
- this.props.getBBSList()
- }
-
- // loadMore () {
- // setTimeout(() => {
- // const showCount = this.state.showCount + 5
- // const bbsList = this.state.bbsList.concat(this.props.list.list.slice(this.state.showCount, showCount))
- // console.log('load call', this.state.showCount, showCount, bbsList, showCount, this.props.list.list.length)
- // this.setState({bbsList, showCount})
- // if (showCount > this.props.list.list.length) this.setState({hasMore: false})
- // }, 100)
- // }
-
- renderContents() {
- if (this.props.loading || !this.props.list)
- return (
-
-
-
-
- -
-
-
-
- -- -
- ホーム -
-
-
-
-
-
- )
- return this.props.showList.map((each, i) => {
- const text = each.text
- .replace(/(|
)/gi, '\n') - .replace(/>/gi, '>') - .replace(/</gi, '<') - return ( -
-
- )
- })
- }
-
- renderMore() {
- if (this.props.loading || !this.props.list) return false
- return this.props.showMore ? (
-
- {each.number}
- {each.name}
- {each.time}
-
- {/* */}
-
- {text.split('\n').map((m, j) => {
- return
- {m}
- })} - this.props.loadMore()} className="more">
- More
-
- ) : (
- false
- )
- }
-
- render() {
- const showList = this.renderContents()
- const showMore = this.renderMore()
-
- return (
-
-
-
-
- ホーム
-
- 掲示板
-
- 会員専用掲示板
-
-
-
-
-
- -
-
-
-
- - 書き込む -- -
-
-
-
-
-
-
-
- {showList}
- {showMore}
-
-
-
-
- {/* */}
-
-
- -
-
-
-
- - 書き込む -- -
-
-
-
-
-
- ホーム
-
- 掲示板
-
- 書き込む
-
- 書き込む
-
-
-
-
- this.props.setPostName(e.target.value)}
- />
-
-
-
-