martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-12 03:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

setting placeholder color on login

Browse Source
This commit is contained in:
balzack 2022-10-21 21:22:18 -07:00
parent 23e1c2aa9c
commit b2798163d0
9 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/mobile/ios/Databag.xcodeproj/project.pbxproj
View File

@ -310,7 +310,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 13; CURRENT_PROJECT_VERSION = 15;
DEVELOPMENT_TEAM = 3P65PQ7SUR; DEVELOPMENT_TEAM = 3P65PQ7SUR;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
@ -348,7 +348,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 13; CURRENT_PROJECT_VERSION = 15;
DEVELOPMENT_TEAM = 3P65PQ7SUR; DEVELOPMENT_TEAM = 3P65PQ7SUR;
INFOPLIST_FILE = Databag/Info.plist; INFOPLIST_FILE = Databag/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Databag; INFOPLIST_KEY_CFBundleDisplayName = Databag;

6
app/mobile/src/access/admin/Admin.jsx
View File

@ -2,6 +2,7 @@ import { ActivityIndicator, Alert, Text, TextInput, View, TouchableOpacity } fro
import { styles } from './Admin.styled'; import { styles } from './Admin.styled';
import Ionicons from '@expo/vector-icons/AntDesign'; import Ionicons from '@expo/vector-icons/AntDesign';
import { useAdmin } from './useAdmin.hook'; import { useAdmin } from './useAdmin.hook';
import Colors from 'constants/Colors';
export function Admin() { export function Admin() {
@ -35,13 +36,14 @@ export function Admin() {
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="database" size={18} color="#aaaaaa" /> <Ionicons style={styles.icon} name="database" size={18} color="#aaaaaa" />
<TextInput style={styles.inputfield} value={state.server} onChangeText={actions.setServer} <TextInput style={styles.inputfield} value={state.server} onChangeText={actions.setServer}
autoCorrect={false} autoCapitalize="none" placeholder="server" /> autoCorrect={false} autoCapitalize="none" placeholder="server" placeholderTextColor={Colors.grey} />
<View style={styles.space} /> <View style={styles.space} />
</View> </View>
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="key" size={18} color="#aaaaaa" /> <Ionicons style={styles.icon} name="key" size={18} color="#aaaaaa" />
<TextInput style={styles.inputfield} value={state.token} onChangeText={actions.setToken} <TextInput style={styles.inputfield} value={state.token} onChangeText={actions.setToken}
secureTextEntry={!state.plainText} autoCapitalize="none" placeholder="token"/> secureTextEntry={!state.plainText} autoCapitalize="none" placeholder="token"
placeholderTextColor={Colors.grey} />
<TouchableOpacity> <TouchableOpacity>
{ state.plainText && ( { state.plainText && (
<Ionicons style={styles.icon} name="eye" size={18} color="#aaaaaa" onPress={actions.hidePass}/> <Ionicons style={styles.icon} name="eye" size={18} color="#aaaaaa" onPress={actions.hidePass}/>

2
app/mobile/src/access/admin/Admin.styled.js
View File

@ -97,7 +97,7 @@ export const styles = StyleSheet.create({
borderWidth: 1, borderWidth: 1,
}, },
noresettext: { noresettext: {
color: Colors.disabled, color: Colors.grey,
}, },
login: { login: {
marginTop: 16, marginTop: 16,

18
app/mobile/src/access/create/Create.jsx
View File

@ -2,6 +2,7 @@ import { ScrollView, ActivityIndicator, Alert, Text, TextInput, View, TouchableO
import { styles } from './Create.styled'; import { styles } from './Create.styled';
import Ionicons from '@expo/vector-icons/AntDesign'; import Ionicons from '@expo/vector-icons/AntDesign';
import { useCreate } from './useCreate.hook'; import { useCreate } from './useCreate.hook';
import Colors from 'constants/Colors';
export function Create() { export function Create() {
@ -39,7 +40,7 @@ export function Create() {
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="database" size={18} color="#888888" /> <Ionicons style={styles.icon} name="database" size={18} color="#888888" />
<TextInput style={styles.inputfield} value={state.server} onChangeText={actions.setServer} <TextInput style={styles.inputfield} value={state.server} onChangeText={actions.setServer}
autoCorrect={false} autoCapitalize="none" placeholder="server" /> autoCorrect={false} autoCapitalize="none" placeholder="server" placeholderTextColor={Colors.grey} />
<View style={styles.space}> <View style={styles.space}>
{ (!state.server || !state.serverChecked) && ( { (!state.server || !state.serverChecked) && (
<Text style={styles.required}>✻</Text> <Text style={styles.required}>✻</Text>
@ -57,7 +58,7 @@ export function Create() {
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="key" size={18} color="#888888" /> <Ionicons style={styles.icon} name="key" size={18} color="#888888" />
<TextInput style={styles.inputfield} value={state.token} onChangeText={actions.setToken} <TextInput style={styles.inputfield} value={state.token} onChangeText={actions.setToken}
autoCorrect={false} autoCapitalize="none" placeholder="token" /> autoCorrect={false} autoCapitalize="none" placeholder="token" placeholderTextColor={Colors.grey} />
<View style={styles.space}> <View style={styles.space}>
{ (!validServer || !state.token || !state.tokenChecked) && ( { (!validServer || !state.token || !state.tokenChecked) && (
<Text style={styles.required}>✻</Text> <Text style={styles.required}>✻</Text>
@ -75,7 +76,7 @@ export function Create() {
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="user" size={18} color="#888888" /> <Ionicons style={styles.icon} name="user" size={18} color="#888888" />
<TextInput style={styles.inputfield} value={state.username} onChangeText={actions.setUsername} <TextInput style={styles.inputfield} value={state.username} onChangeText={actions.setUsername}
autoCorrect={false} autoCapitalize="none" placeholder="username" /> autoCorrect={false} autoCapitalize="none" placeholder="username" placeholderTextColor={Colors.grey} />
<View style={styles.space}> <View style={styles.space}>
{ (!validServer || !validToken || !state.username || !state.usernameChecked) && ( { (!validServer || !validToken || !state.username || !state.usernameChecked) && (
<Text style={styles.required}>✻</Text> <Text style={styles.required}>✻</Text>
@ -92,7 +93,7 @@ export function Create() {
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="lock" size={18} color="#888888" /> <Ionicons style={styles.icon} name="lock" size={18} color="#888888" />
<TextInput style={styles.inputfield} value={state.password} onChangeText={actions.setPassword} <TextInput style={styles.inputfield} value={state.password} onChangeText={actions.setPassword}
autoCorrect={false} autoCapitalize="none" placeholder="password" /> autoCorrect={false} autoCapitalize="none" placeholder="password" placeholderTextColor={Colors.grey} />
<TouchableOpacity onPress={actions.hidePassword}> <TouchableOpacity onPress={actions.hidePassword}>
<Ionicons style={styles.icon} name="eye" size={18} color="#888888" /> <Ionicons style={styles.icon} name="eye" size={18} color="#888888" />
</TouchableOpacity> </TouchableOpacity>
@ -102,7 +103,8 @@ export function Create() {
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="lock" size={18} color="#888888" /> <Ionicons style={styles.icon} name="lock" size={18} color="#888888" />
<TextInput style={styles.inputfield} value={state.password} onChangeText={actions.setPassword} <TextInput style={styles.inputfield} value={state.password} onChangeText={actions.setPassword}
autoCorrect={false} secureTextEntry={true} autoCapitalize="none" placeholder="password" /> autoCorrect={false} secureTextEntry={true} autoCapitalize="none" placeholder="password"
placeholderTextColor={Colors.grey} />
<TouchableOpacity onPress={actions.showPassword}> <TouchableOpacity onPress={actions.showPassword}>
<Ionicons style={styles.icon} name="eyeo" size={18} color="#888888" /> <Ionicons style={styles.icon} name="eyeo" size={18} color="#888888" />
</TouchableOpacity> </TouchableOpacity>
@ -112,7 +114,8 @@ export function Create() {
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="lock" size={18} color="#888888" /> <Ionicons style={styles.icon} name="lock" size={18} color="#888888" />
<TextInput style={styles.inputfield} value={state.confirm} onChangeText={actions.setConfirm} <TextInput style={styles.inputfield} value={state.confirm} onChangeText={actions.setConfirm}
autoCorrect={false} autoCapitalize="none" placeholder="confirm password" /> autoCorrect={false} autoCapitalize="none" placeholder="confirm password"
placeholderTextColor={Colors.grey} />
<TouchableOpacity onPress={actions.hideConfirm}> <TouchableOpacity onPress={actions.hideConfirm}>
<Ionicons style={styles.icon} name="eye" size={18} color="#888888" /> <Ionicons style={styles.icon} name="eye" size={18} color="#888888" />
</TouchableOpacity> </TouchableOpacity>
@ -122,7 +125,8 @@ export function Create() {
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="lock" size={18} color="#888888" /> <Ionicons style={styles.icon} name="lock" size={18} color="#888888" />
<TextInput style={styles.inputfield} value={state.confirm} onChangeText={actions.setConfirm} <TextInput style={styles.inputfield} value={state.confirm} onChangeText={actions.setConfirm}
autoCorrect={false} secureTextEntry={true} autoCapitalize="none" placeholder="confirm password" /> autoCorrect={false} secureTextEntry={true} autoCapitalize="none" placeholder="confirm password"
placeholderTextColor={Colors.grey} />
<TouchableOpacity onPress={actions.showConfirm}> <TouchableOpacity onPress={actions.showConfirm}>
<Ionicons style={styles.icon} name="eyeo" size={18} color="#888888" /> <Ionicons style={styles.icon} name="eyeo" size={18} color="#888888" />
</TouchableOpacity> </TouchableOpacity>

2
app/mobile/src/access/create/Create.styled.js
View File

@ -124,7 +124,7 @@ export const styles = StyleSheet.create({
marginBottom: 16, marginBottom: 16,
}, },
nocreatetext: { nocreatetext: {
color: Colors.disabled, color: Colors.grey,
}, },
login: { login: {
marginTop: 16, marginTop: 16,

8
app/mobile/src/access/login/Login.jsx
View File

@ -2,6 +2,7 @@ import { ActivityIndicator, Alert, Text, TextInput, View, TouchableOpacity } fro
import { styles } from './Login.styled'; import { styles } from './Login.styled';
import Ionicons from '@expo/vector-icons/AntDesign'; import Ionicons from '@expo/vector-icons/AntDesign';
import { useLogin } from './useLogin.hook'; import { useLogin } from './useLogin.hook';
import { Colors } from 'constants/Colors';
export function Login() { export function Login() {
@ -35,14 +36,14 @@ export function Login() {
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="user" size={18} color="#aaaaaa" /> <Ionicons style={styles.icon} name="user" size={18} color="#aaaaaa" />
<TextInput style={styles.inputfield} value={state.login} onChangeText={actions.setLogin} <TextInput style={styles.inputfield} value={state.login} onChangeText={actions.setLogin}
autoCorrect={false} autoCapitalize="none" placeholder="username@server" /> autoCorrect={false} autoCapitalize="none" placeholder="username@server" placeholderTextColor={Colors.grey} />
<View style={styles.space} /> <View style={styles.space} />
</View> </View>
{ state.showPassword && ( { state.showPassword && (
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="lock" size={18} color="#aaaaaa" /> <Ionicons style={styles.icon} name="lock" size={18} color="#aaaaaa" />
<TextInput style={styles.inputfield} value={state.password} onChangeText={actions.setPassword} <TextInput style={styles.inputfield} value={state.password} onChangeText={actions.setPassword}
autoCorrect={false} autoCapitalize="none" placeholder="password"/> autoCorrect={false} autoCapitalize="none" placeholder="password" placeholderTextColor={Colors.grey} />
<TouchableOpacity onPress={actions.hidePassword}> <TouchableOpacity onPress={actions.hidePassword}>
<Ionicons style={styles.icon} name="eye" size={18} color="#aaaaaa" /> <Ionicons style={styles.icon} name="eye" size={18} color="#aaaaaa" />
</TouchableOpacity> </TouchableOpacity>
@ -52,7 +53,8 @@ export function Login() {
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="lock" size={18} color="#aaaaaa" /> <Ionicons style={styles.icon} name="lock" size={18} color="#aaaaaa" />
<TextInput style={styles.inputfield} value={state.password} onChangeText={actions.setPassword} <TextInput style={styles.inputfield} value={state.password} onChangeText={actions.setPassword}
autoCorrect={false} secureTextEntry={true} autoCapitalize="none" placeholder="password" /> autoCorrect={false} secureTextEntry={true} autoCapitalize="none" placeholder="password"
placeholderTextColor={Colors.grey} />
<TouchableOpacity onPress={actions.showPassword}> <TouchableOpacity onPress={actions.showPassword}>
<Ionicons style={styles.icon} name="eyeo" size={18} color="#aaaaaa" /> <Ionicons style={styles.icon} name="eyeo" size={18} color="#aaaaaa" />
</TouchableOpacity> </TouchableOpacity>

2
app/mobile/src/access/login/Login.styled.js
View File

@ -97,7 +97,7 @@ export const styles = StyleSheet.create({
borderWidth: 1, borderWidth: 1,
}, },
nologintext: { nologintext: {
color: Colors.disabled, color: Colors.grey,
}, },
create: { create: {
marginTop: 16, marginTop: 16,

5
app/mobile/src/access/reset/Reset.jsx
View File

@ -2,6 +2,7 @@ import { ActivityIndicator, Alert, Text, TextInput, View, TouchableOpacity } fro
import { styles } from './Reset.styled'; import { styles } from './Reset.styled';
import Ionicons from '@expo/vector-icons/AntDesign'; import Ionicons from '@expo/vector-icons/AntDesign';
import { useReset } from './useReset.hook'; import { useReset } from './useReset.hook';
import Colors from 'constants/Colors';
export function Reset() { export function Reset() {
@ -35,13 +36,13 @@ export function Reset() {
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="database" size={18} color="#aaaaaa" /> <Ionicons style={styles.icon} name="database" size={18} color="#aaaaaa" />
<TextInput style={styles.inputfield} value={state.server} onChangeText={actions.setServer} <TextInput style={styles.inputfield} value={state.server} onChangeText={actions.setServer}
autoCapitalize="none" placeholder="server" /> autoCapitalize="none" placeholder="server" placeholderTextColor={Colors.grey} />
<View style={styles.space} /> <View style={styles.space} />
</View> </View>
<View style={styles.inputwrapper}> <View style={styles.inputwrapper}>
<Ionicons style={styles.icon} name="key" size={18} color="#aaaaaa" /> <Ionicons style={styles.icon} name="key" size={18} color="#aaaaaa" />
<TextInput style={styles.inputfield} value={state.token} onChangeText={actions.setToken} <TextInput style={styles.inputfield} value={state.token} onChangeText={actions.setToken}
autoCapitalize="none" placeholder="token"/> autoCapitalize="none" placeholder="token" placeholderTextColor={Colors.grey} />
<View style={styles.space} /> <View style={styles.space} />
</View> </View>
{ state.enabled && ( { state.enabled && (

2
app/mobile/src/access/reset/Reset.styled.js
View File

@ -97,7 +97,7 @@ export const styles = StyleSheet.create({
borderWidth: 1, borderWidth: 1,
}, },
noresettext: { noresettext: {
color: Colors.disabled, color: Colors.grey,
}, },
login: { login: {
marginTop: 16, marginTop: 16,