start onboarding, implement connection
This commit is contained in:
@@ -12,8 +12,10 @@ inoremap <silent> <expr> <Down> coc#pum#visible() ? coc#pum#next(0) : coc#inline
|
|||||||
inoremap <silent> <expr> <C-P> coc#pum#visible() ? coc#pum#prev(1) : coc#inline#visible() ? coc#inline#prev() : "\"
|
inoremap <silent> <expr> <C-P> coc#pum#visible() ? coc#pum#prev(1) : coc#inline#visible() ? coc#inline#prev() : "\"
|
||||||
inoremap <silent> <expr> <C-N> coc#pum#visible() ? coc#pum#next(1) : coc#inline#visible() ? coc#inline#next() : "\"
|
inoremap <silent> <expr> <C-N> coc#pum#visible() ? coc#pum#next(1) : coc#inline#visible() ? coc#inline#next() : "\"
|
||||||
nnoremap :NERDTreeFind
|
nnoremap :NERDTreeFind
|
||||||
|
snoremap <silent> c
|
||||||
nnoremap :NERDTree
|
nnoremap :NERDTree
|
||||||
nmap <Plug>(ctrlp)
|
nmap <Plug>(ctrlp)
|
||||||
|
snoremap "_c
|
||||||
nnoremap :NERDTreeToggle
|
nnoremap :NERDTreeToggle
|
||||||
xmap \T <Plug>(table-mode-tableize-delimiter)
|
xmap \T <Plug>(table-mode-tableize-delimiter)
|
||||||
xmap \tt <Plug>(table-mode-tableize)
|
xmap \tt <Plug>(table-mode-tableize)
|
||||||
@@ -26,6 +28,10 @@ nnoremap \1 :call SN("1")
|
|||||||
nmap \rn <Plug>(coc-rename)
|
nmap \rn <Plug>(coc-rename)
|
||||||
xmap gx <Plug>NetrwBrowseXVis
|
xmap gx <Plug>NetrwBrowseXVis
|
||||||
nmap gx <Plug>NetrwBrowseX
|
nmap gx <Plug>NetrwBrowseX
|
||||||
|
snoremap <C-R> "_c
|
||||||
|
snoremap <silent> <C-H> c
|
||||||
|
snoremap <silent> <Del> c
|
||||||
|
snoremap <silent> <BS> c
|
||||||
nnoremap <silent> <Plug>GitGutterPreviewHunk :call gitgutter#utility#warn('Please change your map <Plug>GitGutterPreviewHunk to <Plug>(GitGutterPreviewHunk)')
|
nnoremap <silent> <Plug>GitGutterPreviewHunk :call gitgutter#utility#warn('Please change your map <Plug>GitGutterPreviewHunk to <Plug>(GitGutterPreviewHunk)')
|
||||||
nnoremap <silent> <Plug>(GitGutterPreviewHunk) :GitGutterPreviewHunk
|
nnoremap <silent> <Plug>(GitGutterPreviewHunk) :GitGutterPreviewHunk
|
||||||
nnoremap <silent> <Plug>GitGutterUndoHunk :call gitgutter#utility#warn('Please change your map <Plug>GitGutterUndoHunk to <Plug>(GitGutterUndoHunk)')
|
nnoremap <silent> <Plug>GitGutterUndoHunk :call gitgutter#utility#warn('Please change your map <Plug>GitGutterUndoHunk to <Plug>(GitGutterUndoHunk)')
|
||||||
@@ -147,15 +153,15 @@ else
|
|||||||
endif
|
endif
|
||||||
badd +1 build/sw.js
|
badd +1 build/sw.js
|
||||||
badd +1 build/version.txt
|
badd +1 build/version.txt
|
||||||
badd +41 src/ViewModel/Global/contactViewModel.ts
|
badd +90 src/index.tsx
|
||||||
badd +50 src/index.tsx
|
badd +0 src/View/Modals/onboardingModal.tsx
|
||||||
badd +24 src/ViewModel/Global/settingsViewModel.ts
|
badd +0 src/ViewModel/Global/onboardingViewModel.ts
|
||||||
badd +38 src/Model/Global/settingsModel.ts
|
badd +0 src/View/translations.ts
|
||||||
badd +0 src/Model/Global/contactListModel.ts
|
|
||||||
argglobal
|
argglobal
|
||||||
%argdel
|
%argdel
|
||||||
set stal=2
|
set stal=2
|
||||||
tabnew +setlocal\ bufhidden=wipe
|
tabnew +setlocal\ bufhidden=wipe
|
||||||
|
tabnew +setlocal\ bufhidden=wipe
|
||||||
tabrewind
|
tabrewind
|
||||||
edit build/sw.js
|
edit build/sw.js
|
||||||
let s:save_splitbelow = &splitbelow
|
let s:save_splitbelow = &splitbelow
|
||||||
@@ -177,9 +183,9 @@ set winminheight=0
|
|||||||
set winheight=1
|
set winheight=1
|
||||||
set winminwidth=0
|
set winminwidth=0
|
||||||
set winwidth=1
|
set winwidth=1
|
||||||
exe 'vert 1resize ' . ((&columns * 31 + 135) / 270)
|
exe 'vert 1resize ' . ((&columns * 31 + 137) / 274)
|
||||||
exe 'vert 2resize ' . ((&columns * 118 + 135) / 270)
|
exe 'vert 2resize ' . ((&columns * 120 + 137) / 274)
|
||||||
exe 'vert 3resize ' . ((&columns * 123 + 135) / 270)
|
exe 'vert 3resize ' . ((&columns * 121 + 137) / 274)
|
||||||
argglobal
|
argglobal
|
||||||
enew
|
enew
|
||||||
file NERD_tree_tab_2
|
file NERD_tree_tab_2
|
||||||
@@ -510,12 +516,12 @@ setlocal wrap
|
|||||||
setlocal wrapmargin=0
|
setlocal wrapmargin=0
|
||||||
silent! normal! zE
|
silent! normal! zE
|
||||||
let &fdl = &fdl
|
let &fdl = &fdl
|
||||||
let s:l = 10 - ((9 * winheight(0) + 13) / 27)
|
let s:l = 1 - ((0 * winheight(0) + 18) / 37)
|
||||||
if s:l < 1 | let s:l = 1 | endif
|
if s:l < 1 | let s:l = 1 | endif
|
||||||
keepjumps exe s:l
|
keepjumps exe s:l
|
||||||
normal! zt
|
normal! zt
|
||||||
keepjumps 10
|
keepjumps 1
|
||||||
normal! $
|
normal! 0
|
||||||
wincmd w
|
wincmd w
|
||||||
argglobal
|
argglobal
|
||||||
if bufexists(fnamemodify("build/version.txt", ":p")) | buffer build/version.txt | else | edit build/version.txt | endif
|
if bufexists(fnamemodify("build/version.txt", ":p")) | buffer build/version.txt | else | edit build/version.txt | endif
|
||||||
@@ -667,27 +673,24 @@ setlocal wrap
|
|||||||
setlocal wrapmargin=0
|
setlocal wrapmargin=0
|
||||||
silent! normal! zE
|
silent! normal! zE
|
||||||
let &fdl = &fdl
|
let &fdl = &fdl
|
||||||
let s:l = 1 - ((0 * winheight(0) + 13) / 27)
|
let s:l = 1 - ((0 * winheight(0) + 18) / 37)
|
||||||
if s:l < 1 | let s:l = 1 | endif
|
if s:l < 1 | let s:l = 1 | endif
|
||||||
keepjumps exe s:l
|
keepjumps exe s:l
|
||||||
normal! zt
|
normal! zt
|
||||||
keepjumps 1
|
keepjumps 1
|
||||||
normal! 014|
|
normal! 0
|
||||||
wincmd w
|
wincmd w
|
||||||
exe 'vert 1resize ' . ((&columns * 31 + 135) / 270)
|
exe 'vert 1resize ' . ((&columns * 31 + 137) / 274)
|
||||||
exe 'vert 2resize ' . ((&columns * 118 + 135) / 270)
|
exe 'vert 2resize ' . ((&columns * 120 + 137) / 274)
|
||||||
exe 'vert 3resize ' . ((&columns * 123 + 135) / 270)
|
exe 'vert 3resize ' . ((&columns * 121 + 137) / 274)
|
||||||
tabnext
|
tabnext
|
||||||
edit src/index.tsx
|
edit src/ViewModel/Global/onboardingViewModel.ts
|
||||||
let s:save_splitbelow = &splitbelow
|
let s:save_splitbelow = &splitbelow
|
||||||
let s:save_splitright = &splitright
|
let s:save_splitright = &splitright
|
||||||
set splitbelow splitright
|
set splitbelow splitright
|
||||||
wincmd _ | wincmd |
|
wincmd _ | wincmd |
|
||||||
vsplit
|
vsplit
|
||||||
wincmd _ | wincmd |
|
1wincmd h
|
||||||
vsplit
|
|
||||||
2wincmd h
|
|
||||||
wincmd w
|
|
||||||
wincmd w
|
wincmd w
|
||||||
let &splitbelow = s:save_splitbelow
|
let &splitbelow = s:save_splitbelow
|
||||||
let &splitright = s:save_splitright
|
let &splitright = s:save_splitright
|
||||||
@@ -698,11 +701,167 @@ set winminheight=0
|
|||||||
set winheight=1
|
set winheight=1
|
||||||
set winminwidth=0
|
set winminwidth=0
|
||||||
set winwidth=1
|
set winwidth=1
|
||||||
exe 'vert 1resize ' . ((&columns * 89 + 135) / 270)
|
exe 'vert 1resize ' . ((&columns * 137 + 137) / 274)
|
||||||
exe 'vert 2resize ' . ((&columns * 89 + 135) / 270)
|
exe 'vert 2resize ' . ((&columns * 136 + 137) / 274)
|
||||||
exe 'vert 3resize ' . ((&columns * 90 + 135) / 270)
|
|
||||||
argglobal
|
argglobal
|
||||||
balt src/ViewModel/Global/settingsViewModel.ts
|
balt src/index.tsx
|
||||||
|
let s:cpo_save=&cpo
|
||||||
|
set cpo&vim
|
||||||
|
nmap <buffer> [c <Plug>(GitGutterPrevHunk)
|
||||||
|
nmap <buffer> \hp <Plug>(GitGutterPreviewHunk)
|
||||||
|
nmap <buffer> \hu <Plug>(GitGutterUndoHunk)
|
||||||
|
nmap <buffer> \hs <Plug>(GitGutterStageHunk)
|
||||||
|
xmap <buffer> \hs <Plug>(GitGutterStageHunk)
|
||||||
|
nmap <buffer> ]c <Plug>(GitGutterNextHunk)
|
||||||
|
xmap <buffer> ac <Plug>(GitGutterTextObjectOuterVisual)
|
||||||
|
omap <buffer> ac <Plug>(GitGutterTextObjectOuterPending)
|
||||||
|
xmap <buffer> ic <Plug>(GitGutterTextObjectInnerVisual)
|
||||||
|
omap <buffer> ic <Plug>(GitGutterTextObjectInnerPending)
|
||||||
|
let &cpo=s:cpo_save
|
||||||
|
unlet s:cpo_save
|
||||||
|
setlocal keymap=
|
||||||
|
setlocal noarabic
|
||||||
|
setlocal autoindent
|
||||||
|
setlocal backupcopy=
|
||||||
|
setlocal balloonexpr=
|
||||||
|
setlocal nobinary
|
||||||
|
setlocal nobreakindent
|
||||||
|
setlocal breakindentopt=
|
||||||
|
setlocal bufhidden=
|
||||||
|
setlocal buflisted
|
||||||
|
setlocal buftype=
|
||||||
|
setlocal nocindent
|
||||||
|
setlocal cinkeys=0{,0},0),0],:,0#,!^F,o,O,e
|
||||||
|
setlocal cinoptions=
|
||||||
|
setlocal cinscopedecls=public,protected,private
|
||||||
|
setlocal cinwords=if,else,while,do,for,switch
|
||||||
|
setlocal colorcolumn=
|
||||||
|
setlocal comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-
|
||||||
|
setlocal commentstring=//\ %s
|
||||||
|
setlocal complete=.,w,b,u,t,i
|
||||||
|
setlocal concealcursor=
|
||||||
|
setlocal conceallevel=0
|
||||||
|
setlocal completefunc=
|
||||||
|
setlocal nocopyindent
|
||||||
|
setlocal cryptmethod=
|
||||||
|
setlocal nocursorbind
|
||||||
|
setlocal nocursorcolumn
|
||||||
|
setlocal nocursorline
|
||||||
|
setlocal cursorlineopt=both
|
||||||
|
setlocal define=
|
||||||
|
setlocal dictionary=
|
||||||
|
setlocal nodiff
|
||||||
|
setlocal equalprg=
|
||||||
|
setlocal errorformat=%+A\ %#%f\ %#(%l\\,%c):\ %m,%C%m
|
||||||
|
setlocal noexpandtab
|
||||||
|
if &filetype != 'typescript'
|
||||||
|
setlocal filetype=typescript
|
||||||
|
endif
|
||||||
|
setlocal fillchars=
|
||||||
|
setlocal fixendofline
|
||||||
|
setlocal foldcolumn=0
|
||||||
|
setlocal foldenable
|
||||||
|
setlocal foldexpr=0
|
||||||
|
setlocal foldignore=#
|
||||||
|
setlocal foldlevel=0
|
||||||
|
setlocal foldmarker={{{,}}}
|
||||||
|
setlocal foldmethod=manual
|
||||||
|
setlocal foldminlines=1
|
||||||
|
setlocal foldnestmax=20
|
||||||
|
setlocal foldtext=foldtext()
|
||||||
|
setlocal formatexpr=
|
||||||
|
setlocal formatoptions=croql
|
||||||
|
setlocal formatlistpat=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s*
|
||||||
|
setlocal formatprg=
|
||||||
|
setlocal grepprg=
|
||||||
|
setlocal iminsert=0
|
||||||
|
setlocal imsearch=-1
|
||||||
|
setlocal include=
|
||||||
|
setlocal includeexpr=
|
||||||
|
setlocal indentexpr=GetTypescriptIndent()
|
||||||
|
setlocal indentkeys=0{,0},0),0],:,0#,!^F,o,O,e,0],0)
|
||||||
|
setlocal noinfercase
|
||||||
|
setlocal iskeyword=@,48-57,_,192-255,$
|
||||||
|
setlocal keywordprg=
|
||||||
|
setlocal nolinebreak
|
||||||
|
setlocal nolisp
|
||||||
|
setlocal lispoptions=
|
||||||
|
setlocal lispwords=
|
||||||
|
setlocal nolist
|
||||||
|
setlocal listchars=
|
||||||
|
setlocal makeencoding=
|
||||||
|
setlocal makeprg=tsc\ \ $*\ %
|
||||||
|
setlocal matchpairs=(:),{:},[:]
|
||||||
|
setlocal nomodeline
|
||||||
|
setlocal modifiable
|
||||||
|
setlocal nrformats=bin,octal,hex
|
||||||
|
set number
|
||||||
|
setlocal number
|
||||||
|
setlocal numberwidth=4
|
||||||
|
setlocal omnifunc=
|
||||||
|
setlocal path=
|
||||||
|
setlocal nopreserveindent
|
||||||
|
setlocal nopreviewwindow
|
||||||
|
setlocal quoteescape=\\
|
||||||
|
setlocal noreadonly
|
||||||
|
setlocal norelativenumber
|
||||||
|
setlocal norightleft
|
||||||
|
setlocal rightleftcmd=search
|
||||||
|
setlocal noscrollbind
|
||||||
|
setlocal scrolloff=-1
|
||||||
|
setlocal shiftwidth=4
|
||||||
|
setlocal noshortname
|
||||||
|
setlocal showbreak=
|
||||||
|
setlocal sidescrolloff=-1
|
||||||
|
set signcolumn=yes
|
||||||
|
setlocal signcolumn=yes
|
||||||
|
setlocal nosmartindent
|
||||||
|
setlocal nosmoothscroll
|
||||||
|
setlocal softtabstop=0
|
||||||
|
setlocal nospell
|
||||||
|
setlocal spellcapcheck=[.?!]\\_[\\])'\"\ \ ]\\+
|
||||||
|
setlocal spellfile=
|
||||||
|
setlocal spelllang=en
|
||||||
|
setlocal spelloptions=
|
||||||
|
setlocal statusline=
|
||||||
|
setlocal suffixesadd=.ts,.tsx
|
||||||
|
setlocal swapfile
|
||||||
|
setlocal synmaxcol=3000
|
||||||
|
if &syntax != 'typescript'
|
||||||
|
setlocal syntax=typescript
|
||||||
|
endif
|
||||||
|
setlocal tabstop=8
|
||||||
|
setlocal tagcase=
|
||||||
|
setlocal tagfunc=
|
||||||
|
setlocal tags=
|
||||||
|
setlocal termwinkey=
|
||||||
|
setlocal termwinscroll=10000
|
||||||
|
setlocal termwinsize=
|
||||||
|
setlocal textwidth=0
|
||||||
|
setlocal thesaurus=
|
||||||
|
setlocal thesaurusfunc=
|
||||||
|
setlocal noundofile
|
||||||
|
setlocal undolevels=-123456
|
||||||
|
setlocal varsofttabstop=
|
||||||
|
setlocal vartabstop=
|
||||||
|
setlocal virtualedit=
|
||||||
|
setlocal wincolor=
|
||||||
|
setlocal nowinfixheight
|
||||||
|
setlocal nowinfixwidth
|
||||||
|
setlocal wrap
|
||||||
|
setlocal wrapmargin=0
|
||||||
|
silent! normal! zE
|
||||||
|
let &fdl = &fdl
|
||||||
|
let s:l = 1 - ((0 * winheight(0) + 18) / 36)
|
||||||
|
if s:l < 1 | let s:l = 1 | endif
|
||||||
|
keepjumps exe s:l
|
||||||
|
normal! zt
|
||||||
|
keepjumps 1
|
||||||
|
normal! 0
|
||||||
|
wincmd w
|
||||||
|
argglobal
|
||||||
|
if bufexists(fnamemodify("src/View/Modals/onboardingModal.tsx", ":p")) | buffer src/View/Modals/onboardingModal.tsx | else | edit src/View/Modals/onboardingModal.tsx | endif
|
||||||
|
balt src/index.tsx
|
||||||
let s:cpo_save=&cpo
|
let s:cpo_save=&cpo
|
||||||
set cpo&vim
|
set cpo&vim
|
||||||
nmap <buffer> [c <Plug>(GitGutterPrevHunk)
|
nmap <buffer> [c <Plug>(GitGutterPrevHunk)
|
||||||
@@ -850,16 +1009,19 @@ setlocal wrap
|
|||||||
setlocal wrapmargin=0
|
setlocal wrapmargin=0
|
||||||
silent! normal! zE
|
silent! normal! zE
|
||||||
let &fdl = &fdl
|
let &fdl = &fdl
|
||||||
let s:l = 44 - ((17 * winheight(0) + 13) / 27)
|
let s:l = 6 - ((5 * winheight(0) + 18) / 36)
|
||||||
if s:l < 1 | let s:l = 1 | endif
|
if s:l < 1 | let s:l = 1 | endif
|
||||||
keepjumps exe s:l
|
keepjumps exe s:l
|
||||||
normal! zt
|
normal! zt
|
||||||
keepjumps 44
|
keepjumps 6
|
||||||
normal! $
|
normal! 032|
|
||||||
wincmd w
|
wincmd w
|
||||||
|
exe 'vert 1resize ' . ((&columns * 137 + 137) / 274)
|
||||||
|
exe 'vert 2resize ' . ((&columns * 136 + 137) / 274)
|
||||||
|
tabnext
|
||||||
|
edit src/View/translations.ts
|
||||||
argglobal
|
argglobal
|
||||||
if bufexists(fnamemodify("src/Model/Global/contactListModel.ts", ":p")) | buffer src/Model/Global/contactListModel.ts | else | edit src/Model/Global/contactListModel.ts | endif
|
balt src/ViewModel/Global/onboardingViewModel.ts
|
||||||
balt src/Model/Global/settingsModel.ts
|
|
||||||
let s:cpo_save=&cpo
|
let s:cpo_save=&cpo
|
||||||
set cpo&vim
|
set cpo&vim
|
||||||
nmap <buffer> [c <Plug>(GitGutterPrevHunk)
|
nmap <buffer> [c <Plug>(GitGutterPrevHunk)
|
||||||
@@ -1007,174 +1169,12 @@ setlocal wrap
|
|||||||
setlocal wrapmargin=0
|
setlocal wrapmargin=0
|
||||||
silent! normal! zE
|
silent! normal! zE
|
||||||
let &fdl = &fdl
|
let &fdl = &fdl
|
||||||
let s:l = 22 - ((12 * winheight(0) + 13) / 27)
|
let s:l = 115 - ((18 * winheight(0) + 18) / 37)
|
||||||
if s:l < 1 | let s:l = 1 | endif
|
if s:l < 1 | let s:l = 1 | endif
|
||||||
keepjumps exe s:l
|
keepjumps exe s:l
|
||||||
normal! zt
|
normal! zt
|
||||||
keepjumps 22
|
keepjumps 115
|
||||||
normal! 011|
|
normal! 05|
|
||||||
wincmd w
|
|
||||||
argglobal
|
|
||||||
if bufexists(fnamemodify("src/Model/Global/settingsModel.ts", ":p")) | buffer src/Model/Global/settingsModel.ts | else | edit src/Model/Global/settingsModel.ts | endif
|
|
||||||
balt src/ViewModel/Global/contactViewModel.ts
|
|
||||||
let s:cpo_save=&cpo
|
|
||||||
set cpo&vim
|
|
||||||
nmap <buffer> [c <Plug>(GitGutterPrevHunk)
|
|
||||||
nmap <buffer> \hp <Plug>(GitGutterPreviewHunk)
|
|
||||||
nmap <buffer> \hu <Plug>(GitGutterUndoHunk)
|
|
||||||
nmap <buffer> \hs <Plug>(GitGutterStageHunk)
|
|
||||||
xmap <buffer> \hs <Plug>(GitGutterStageHunk)
|
|
||||||
nmap <buffer> ]c <Plug>(GitGutterNextHunk)
|
|
||||||
xmap <buffer> ac <Plug>(GitGutterTextObjectOuterVisual)
|
|
||||||
omap <buffer> ac <Plug>(GitGutterTextObjectOuterPending)
|
|
||||||
xmap <buffer> ic <Plug>(GitGutterTextObjectInnerVisual)
|
|
||||||
omap <buffer> ic <Plug>(GitGutterTextObjectInnerPending)
|
|
||||||
let &cpo=s:cpo_save
|
|
||||||
unlet s:cpo_save
|
|
||||||
setlocal keymap=
|
|
||||||
setlocal noarabic
|
|
||||||
setlocal autoindent
|
|
||||||
setlocal backupcopy=
|
|
||||||
setlocal balloonexpr=
|
|
||||||
setlocal nobinary
|
|
||||||
setlocal nobreakindent
|
|
||||||
setlocal breakindentopt=
|
|
||||||
setlocal bufhidden=
|
|
||||||
setlocal buflisted
|
|
||||||
setlocal buftype=
|
|
||||||
setlocal nocindent
|
|
||||||
setlocal cinkeys=0{,0},0),0],:,0#,!^F,o,O,e
|
|
||||||
setlocal cinoptions=
|
|
||||||
setlocal cinscopedecls=public,protected,private
|
|
||||||
setlocal cinwords=if,else,while,do,for,switch
|
|
||||||
setlocal colorcolumn=
|
|
||||||
setlocal comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-
|
|
||||||
setlocal commentstring=//\ %s
|
|
||||||
setlocal complete=.,w,b,u,t,i
|
|
||||||
setlocal concealcursor=
|
|
||||||
setlocal conceallevel=0
|
|
||||||
setlocal completefunc=
|
|
||||||
setlocal nocopyindent
|
|
||||||
setlocal cryptmethod=
|
|
||||||
setlocal nocursorbind
|
|
||||||
setlocal nocursorcolumn
|
|
||||||
setlocal nocursorline
|
|
||||||
setlocal cursorlineopt=both
|
|
||||||
setlocal define=
|
|
||||||
setlocal dictionary=
|
|
||||||
setlocal nodiff
|
|
||||||
setlocal equalprg=
|
|
||||||
setlocal errorformat=%+A\ %#%f\ %#(%l\\,%c):\ %m,%C%m
|
|
||||||
setlocal noexpandtab
|
|
||||||
if &filetype != 'typescript'
|
|
||||||
setlocal filetype=typescript
|
|
||||||
endif
|
|
||||||
setlocal fillchars=
|
|
||||||
setlocal fixendofline
|
|
||||||
setlocal foldcolumn=0
|
|
||||||
setlocal foldenable
|
|
||||||
setlocal foldexpr=0
|
|
||||||
setlocal foldignore=#
|
|
||||||
setlocal foldlevel=0
|
|
||||||
setlocal foldmarker={{{,}}}
|
|
||||||
setlocal foldmethod=manual
|
|
||||||
setlocal foldminlines=1
|
|
||||||
setlocal foldnestmax=20
|
|
||||||
setlocal foldtext=foldtext()
|
|
||||||
setlocal formatexpr=
|
|
||||||
setlocal formatoptions=croql
|
|
||||||
setlocal formatlistpat=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s*
|
|
||||||
setlocal formatprg=
|
|
||||||
setlocal grepprg=
|
|
||||||
setlocal iminsert=0
|
|
||||||
setlocal imsearch=-1
|
|
||||||
setlocal include=
|
|
||||||
setlocal includeexpr=
|
|
||||||
setlocal indentexpr=GetTypescriptIndent()
|
|
||||||
setlocal indentkeys=0{,0},0),0],:,0#,!^F,o,O,e,0],0)
|
|
||||||
setlocal noinfercase
|
|
||||||
setlocal iskeyword=@,48-57,_,192-255,$
|
|
||||||
setlocal keywordprg=
|
|
||||||
setlocal nolinebreak
|
|
||||||
setlocal nolisp
|
|
||||||
setlocal lispoptions=
|
|
||||||
setlocal lispwords=
|
|
||||||
setlocal nolist
|
|
||||||
setlocal listchars=
|
|
||||||
setlocal makeencoding=
|
|
||||||
setlocal makeprg=tsc\ \ $*\ %
|
|
||||||
setlocal matchpairs=(:),{:},[:]
|
|
||||||
setlocal nomodeline
|
|
||||||
setlocal modifiable
|
|
||||||
setlocal nrformats=bin,octal,hex
|
|
||||||
set number
|
|
||||||
setlocal number
|
|
||||||
setlocal numberwidth=4
|
|
||||||
setlocal omnifunc=
|
|
||||||
setlocal path=
|
|
||||||
setlocal nopreserveindent
|
|
||||||
setlocal nopreviewwindow
|
|
||||||
setlocal quoteescape=\\
|
|
||||||
setlocal noreadonly
|
|
||||||
setlocal norelativenumber
|
|
||||||
setlocal norightleft
|
|
||||||
setlocal rightleftcmd=search
|
|
||||||
setlocal noscrollbind
|
|
||||||
setlocal scrolloff=-1
|
|
||||||
setlocal shiftwidth=4
|
|
||||||
setlocal noshortname
|
|
||||||
setlocal showbreak=
|
|
||||||
setlocal sidescrolloff=-1
|
|
||||||
set signcolumn=yes
|
|
||||||
setlocal signcolumn=yes
|
|
||||||
setlocal nosmartindent
|
|
||||||
setlocal nosmoothscroll
|
|
||||||
setlocal softtabstop=0
|
|
||||||
setlocal nospell
|
|
||||||
setlocal spellcapcheck=[.?!]\\_[\\])'\"\ \ ]\\+
|
|
||||||
setlocal spellfile=
|
|
||||||
setlocal spelllang=en
|
|
||||||
setlocal spelloptions=
|
|
||||||
setlocal statusline=
|
|
||||||
setlocal suffixesadd=.ts,.tsx
|
|
||||||
setlocal swapfile
|
|
||||||
setlocal synmaxcol=3000
|
|
||||||
if &syntax != 'typescript'
|
|
||||||
setlocal syntax=typescript
|
|
||||||
endif
|
|
||||||
setlocal tabstop=8
|
|
||||||
setlocal tagcase=
|
|
||||||
setlocal tagfunc=
|
|
||||||
setlocal tags=
|
|
||||||
setlocal termwinkey=
|
|
||||||
setlocal termwinscroll=10000
|
|
||||||
setlocal termwinsize=
|
|
||||||
setlocal textwidth=0
|
|
||||||
setlocal thesaurus=
|
|
||||||
setlocal thesaurusfunc=
|
|
||||||
setlocal noundofile
|
|
||||||
setlocal undolevels=-123456
|
|
||||||
setlocal varsofttabstop=
|
|
||||||
setlocal vartabstop=
|
|
||||||
setlocal virtualedit=
|
|
||||||
setlocal wincolor=
|
|
||||||
setlocal nowinfixheight
|
|
||||||
setlocal nowinfixwidth
|
|
||||||
setlocal wrap
|
|
||||||
setlocal wrapmargin=0
|
|
||||||
silent! normal! zE
|
|
||||||
let &fdl = &fdl
|
|
||||||
let s:l = 90 - ((14 * winheight(0) + 13) / 27)
|
|
||||||
if s:l < 1 | let s:l = 1 | endif
|
|
||||||
keepjumps exe s:l
|
|
||||||
normal! zt
|
|
||||||
keepjumps 90
|
|
||||||
normal! 026|
|
|
||||||
wincmd w
|
|
||||||
3wincmd w
|
|
||||||
exe 'vert 1resize ' . ((&columns * 89 + 135) / 270)
|
|
||||||
exe 'vert 2resize ' . ((&columns * 89 + 135) / 270)
|
|
||||||
exe 'vert 3resize ' . ((&columns * 90 + 135) / 270)
|
|
||||||
tabnext 2
|
tabnext 2
|
||||||
set stal=1
|
set stal=1
|
||||||
if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0
|
if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import * as React from "../../react";
|
||||||
|
import CoreViewModel from "../../ViewModel/Global/coreViewModel";
|
||||||
|
import OnboardingViewModel, {OnboardingModals} from "../../ViewModel/Global/onboardingViewModel";
|
||||||
|
|
||||||
|
// MAIN
|
||||||
|
export function OnboardingModalWrapper(coreViewModel: CoreViewModel, onboardingViewModel: OnboardingViewModel) {
|
||||||
|
return <div>
|
||||||
|
{ConnectionModal(coreViewModel, onboardingViewModel)}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
function ConnectionModal(coreViewModel: CoreViewModel, onboardingViewModel: OnboardingViewModel) {
|
||||||
|
const isPresented = React.createProxyState(
|
||||||
|
[onboardingViewModel.presentedModal],
|
||||||
|
() =>
|
||||||
|
onboardingViewModel.presentedModal.value ==
|
||||||
|
OnboardingModals.Connection
|
||||||
|
);
|
||||||
|
|
||||||
|
const connectionViewModel = onboardingViewModel.connectionViewmodel;
|
||||||
|
|
||||||
|
const nextButton = React.createProxyState([connectionViewModel.isConnected], ()=>coreViewModel.translations.onboarding.connectionNextButton(connectionViewModel.isConnected.value));
|
||||||
|
|
||||||
|
return <div
|
||||||
|
class="modal"
|
||||||
|
toggle:open={isPresented}
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<main>
|
||||||
|
<h2>{coreViewModel.translations.onboarding.connectionHeadline}</h2>
|
||||||
|
<p class="secondary width-input">{coreViewModel.translations.onboarding.connectionDescription}</p>
|
||||||
|
|
||||||
|
<hr></hr>
|
||||||
|
|
||||||
|
<label class="tile flex-no">
|
||||||
|
<span class="icon">cell_tower</span>
|
||||||
|
<div>
|
||||||
|
<span>
|
||||||
|
{coreViewModel.translations.homePage.serverAddress}
|
||||||
|
</span>
|
||||||
|
<input
|
||||||
|
placeholder={
|
||||||
|
coreViewModel.translations.homePage
|
||||||
|
.serverAddressPlaceholder
|
||||||
|
}
|
||||||
|
bind:value={connectionViewModel.serverAddressInput}
|
||||||
|
on:enter={connectionViewModel.connect}
|
||||||
|
></input>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
<div class="flex-row width-input justify-end">
|
||||||
|
<button
|
||||||
|
class="standard width-50"
|
||||||
|
on:click={connectionViewModel.connect}
|
||||||
|
toggle:disabled={connectionViewModel.cannotConnect}
|
||||||
|
>
|
||||||
|
{coreViewModel.translations.onboarding.connectButton}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<div class="flex-row justify-end">
|
||||||
|
<button
|
||||||
|
class="primary width-50"
|
||||||
|
on:click={onboardingViewModel.showTransfer}
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
subscribe:innerText={nextButton}
|
||||||
|
></span>
|
||||||
|
<span class="icon">
|
||||||
|
arrow_forward
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
@@ -112,6 +112,13 @@ const englishTranslations = {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onboarding: {
|
||||||
|
connectionHeadline: "Connect to UDN",
|
||||||
|
connectionDescription: "To transfer files and send messages, connect to the Universal Decentralized Network (UDN).",
|
||||||
|
connectButton: "Connect",
|
||||||
|
connectionNextButton: (isConnected: boolean) => isConnected ? "Continue" : "Continue without UDN",
|
||||||
|
},
|
||||||
|
|
||||||
connectionModal: {
|
connectionModal: {
|
||||||
connectionModalHeadline: "Manage Connections",
|
connectionModalHeadline: "Manage Connections",
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
import CoreViewModel from "./coreViewModel";
|
||||||
|
import * as React from "../../react";
|
||||||
|
import FileTransferViewModel from "./fileTransferViewModel";
|
||||||
|
import ConnectionViewModel from "./connectionViewModel";
|
||||||
|
import SettingsViewModel from "./settingsViewModel";
|
||||||
|
|
||||||
|
export default class OnboardingViewModel {
|
||||||
|
// state
|
||||||
|
presentedModal: React.State<OnboardingModals | undefined> = new React.State<any>(undefined);
|
||||||
|
|
||||||
|
// navigation
|
||||||
|
open = (): void => {
|
||||||
|
this.presentedModal.value = OnboardingModals.Connection;
|
||||||
|
}
|
||||||
|
|
||||||
|
showTransfer = (): void => {
|
||||||
|
this.presentedModal.value = OnboardingModals.TransferOrNew;
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
public connectionViewmodel: ConnectionViewModel,
|
||||||
|
public fileTransferViewModel: FileTransferViewModel,
|
||||||
|
public settingsViewModel: SettingsViewModel,
|
||||||
|
) {
|
||||||
|
if (this.settingsViewModel.settingsModel.username == "") this.open();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum OnboardingModals {
|
||||||
|
Connection,
|
||||||
|
TransferOrNew,
|
||||||
|
Name
|
||||||
|
}
|
||||||
@@ -22,6 +22,8 @@ import FileTransferModel from "./Model/Global/fileTransferModel";
|
|||||||
import ContactListModel from "./Model/Global/contactListModel";
|
import ContactListModel from "./Model/Global/contactListModel";
|
||||||
import ConnectionModel from "./Model/Global/connectionModel";
|
import ConnectionModel from "./Model/Global/connectionModel";
|
||||||
import ChatListModel from "./Model/Chat/chatListModel";
|
import ChatListModel from "./Model/Chat/chatListModel";
|
||||||
|
import OnboardingViewModel from "./ViewModel/Global/onboardingViewModel";
|
||||||
|
import {OnboardingModalWrapper} from "./View/Modals/onboardingModal";
|
||||||
|
|
||||||
// models
|
// models
|
||||||
const storageModel = new StorageModel();
|
const storageModel = new StorageModel();
|
||||||
@@ -59,6 +61,7 @@ const chatListViewModel = new ChatListViewModel(
|
|||||||
contactListViewModel,
|
contactListViewModel,
|
||||||
);
|
);
|
||||||
const fileTransferViewModel = new FileTransferViewModel(coreViewModel);
|
const fileTransferViewModel = new FileTransferViewModel(coreViewModel);
|
||||||
|
const onboardingViewModel = new OnboardingViewModel(connectionViewModel, fileTransferViewModel, settingsViewModel);
|
||||||
|
|
||||||
const homeViewModel = new HomeViewModel(
|
const homeViewModel = new HomeViewModel(
|
||||||
coreViewModel,
|
coreViewModel,
|
||||||
@@ -95,6 +98,7 @@ document
|
|||||||
chatListViewModel,
|
chatListViewModel,
|
||||||
),
|
),
|
||||||
ChatPageWrapper(coreViewModel, chatListViewModel),
|
ChatPageWrapper(coreViewModel, chatListViewModel),
|
||||||
|
OnboardingModalWrapper(coreViewModel, onboardingViewModel),
|
||||||
ConnectionModal(coreViewModel, connectionViewModel),
|
ConnectionModal(coreViewModel, connectionViewModel),
|
||||||
DataTransferModalWrapper(
|
DataTransferModalWrapper(
|
||||||
coreViewModel,
|
coreViewModel,
|
||||||
|
|||||||
Reference in New Issue
Block a user